Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 (99ce567b) · Commits · e / devices / android_kernel_oneplus_sm7250

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ include/linux/compile.h
		include/linux/version.h
		include/linux/utsrelease.h
		include/linux/bounds.h
		include/generated

		# stgit generated dirs
		patches-*

Documentation/filesystems/vfs.txt

+1 −2

Original line number	Diff line number	Diff line
		@@ -277,8 +277,7 @@ or bottom half).
		unfreeze_fs: called when VFS is unlocking a filesystem and making it writable
		again.

		statfs: called when the VFS needs to get filesystem statistics. This
		is called with the kernel lock held
		statfs: called when the VFS needs to get filesystem statistics.

		remount_fs: called when the filesystem is remounted. This is called
		with the kernel lock held

Documentation/kbuild/makefiles.txt

+10 −0

Original line number	Diff line number	Diff line
		@@ -316,6 +316,16 @@ more details, with real examples.
		#arch/m68k/fpsp040/Makefile
		ldflags-y := -x

		subdir-ccflags-y, subdir-asflags-y
		The two flags listed above are similar to ccflags-y and as-falgs-y.
		The difference is that the subdir- variants has effect for the kbuild
		file where tey are present and all subdirectories.
		Options specified using subdir-* are added to the commandline before
		the options specified using the non-subdir variants.

		Example:
		subdir-ccflags-y := -Werror

		CFLAGS_$@, AFLAGS_$@

		CFLAGS_$@ and AFLAGS_$@ only apply to commands in current

Documentation/kernel-parameters.txt

+38 −0

Original line number	Diff line number	Diff line
		@@ -231,6 +231,35 @@ and is between 256 and 4096 characters. It is defined in the file
		power state again in power transition.
		1 : disable the power state check

		acpi_sci= [HW,ACPI] ACPI System Control Interrupt trigger mode
		Format: { level \| edge \| high \| low }

		acpi_serialize [HW,ACPI] force serialization of AML methods

		acpi_skip_timer_override [HW,ACPI]
		Recognize and ignore IRQ0/pin2 Interrupt Override.
		For broken nForce2 BIOS resulting in XT-PIC timer.

		acpi_sleep= [HW,ACPI] Sleep options
		Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig,
		old_ordering, s4_nonvs }
		See Documentation/power/video.txt for information on
		s3_bios and s3_mode.
		s3_beep is for debugging; it makes the PC's speaker beep
		as soon as the kernel's real-mode entry point is called.
		s4_nohwsig prevents ACPI hardware signature from being
		used during resume from hibernation.
		old_ordering causes the ACPI 1.0 ordering of the _PTS
		control method, with respect to putting devices into
		low power states, to be enforced (the ACPI 2.0 ordering
		of _PTS is used by default).
		s4_nonvs prevents the kernel from saving/restoring the
		ACPI NVS memory during hibernation.

		acpi_use_timer_override [HW,ACPI]
		Use timer override. For some broken Nvidia NF5 boards
		that require a timer override, but don't have HPET

		acpi_enforce_resources= [ACPI]
		{ strict \| lax \| no }
		Check for resource conflicts between native drivers
		@@ -250,6 +279,9 @@ and is between 256 and 4096 characters. It is defined in the file
		ad1848= [HW,OSS]
		Format: <io>,<irq>,<dma>,<dma2>,<type>

		add_efi_memmap [EFI; X86] Include EFI memory map in
		kernel's map of available physical RAM.

		advansys= [HW,SCSI]
		See header of drivers/scsi/advansys.c.

		@@ -1838,6 +1870,12 @@ and is between 256 and 4096 characters. It is defined in the file
		autoconfiguration.
		Ranges are in pairs (memory base and size).

		ports= [IP_VS_FTP] IPVS ftp helper module
		Default is 21.
		Up to 8 (IP_VS_APP_MAX_PORTS) ports
		may be specified.
		Format: <port>,<port>....

		print-fatal-signals=
		[KNL] debug: print fatal signals
		print-fatal-signals=1: print segfault info to

Documentation/lguest/.gitignore

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		lguest