Merge remote branch 'linus/master' into x86/cpu (7d50d07d) · Commits · e / devices / android_kernel_teracube_2e

Documentation/00-INDEX

+4 −2

Original line number	Diff line number	Diff line
		@@ -32,8 +32,6 @@ DocBook/
		- directory with DocBook templates etc. for kernel documentation.
		HOWTO
		- the process and procedures of how to do Linux kernel development.
		IO-mapping.txt
		- how to access I/O mapped memory from within device drivers.
		IPMI.txt
		- info on Linux Intelligent Platform Management Interface (IPMI) Driver.
		IRQ-affinity.txt
		@@ -84,6 +82,8 @@ blockdev/
		- info on block devices & drivers
		btmrvl.txt
		- info on Marvell Bluetooth driver usage.
		bus-virt-phys-mapping.txt
		- how to access I/O mapped memory from within device drivers.
		cachetlb.txt
		- describes the cache/TLB flushing interfaces Linux uses.
		cdrom/
		@@ -168,6 +168,8 @@ initrd.txt
		- how to use the RAM disk as an initial/temporary root filesystem.
		input/
		- info on Linux input device support.
		io-mapping.txt
		- description of io_mapping functions in linux/io-mapping.h
		io_ordering.txt
		- info on ordering I/O writes to memory-mapped addresses.
		ioctl/

Documentation/ABI/testing/sysfs-bus-pci

+0 −40

Original line number	Diff line number	Diff line
		@@ -133,46 +133,6 @@ Description:
		The symbolic link points to the PCI device sysfs entry of the
		Physical Function this device associates with.


		What: /sys/bus/pci/slots/...
		Date: April 2005 (possibly older)
		KernelVersion: 2.6.12 (possibly older)
		Contact: linux-pci@vger.kernel.org
		Description:
		When the appropriate driver is loaded, it will create a
		directory per claimed physical PCI slot in
		/sys/bus/pci/slots/. The names of these directories are
		specific to the driver, which in turn, are specific to the
		platform, but in general, should match the label on the
		machine's physical chassis.

		The drivers that can create slot directories include the
		PCI hotplug drivers, and as of 2.6.27, the pci_slot driver.

		The slot directories contain, at a minimum, a file named
		'address' which contains the PCI bus:device:function tuple.
		Other files may appear as well, but are specific to the
		driver.

		What: /sys/bus/pci/slots/.../function[0-7]
		Date: March 2010
		KernelVersion: 2.6.35
		Contact: linux-pci@vger.kernel.org
		Description:
		If PCI slot directories (as described above) are created,
		and the physical slot is actually populated with a device,
		symbolic links in the slot directory pointing to the
		device's PCI functions are created as well.

		What: /sys/bus/pci/devices/.../slot
		Date: March 2010
		KernelVersion: 2.6.35
		Contact: linux-pci@vger.kernel.org
		Description:
		If PCI slot directories (as described above) are created,
		a symbolic link pointing to the slot directory will be
		created as well.

		What: /sys/bus/pci/slots/.../module
		Date: June 2009
		Contact: linux-pci@vger.kernel.org

Documentation/IO-mapping.txt→Documentation/bus-virt-phys-mapping.txt

+0 −0

File moved.

View file

Documentation/feature-removal-schedule.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -647,3 +647,10 @@ Who: Stefan Richter <stefanr@s5r6.in-berlin.de>

		----------------------------

		What: The acpi_sleep=s4_nonvs command line option
		When: 2.6.37
		Files: arch/x86/kernel/acpi/sleep.c
		Why: superseded by acpi_sleep=nonvs
		Who: Rafael J. Wysocki <rjw@sisk.pl>

		----------------------------

Documentation/kernel-parameters.txt

+6 −4

Original line number	Diff line number	Diff line
		@@ -254,8 +254,8 @@ and is between 256 and 4096 characters. It is defined in the file
		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.
		nonvs prevents the kernel from saving/restoring the
		ACPI NVS memory during suspend/hibernation and resume.
		sci_force_enable causes the kernel to set SCI_EN directly
		on resume from S1/S3 (which is against the ACPI spec,
		but some broken systems don't work without it).
		@@ -1265,7 +1265,7 @@ and is between 256 and 4096 characters. It is defined in the file
		If there are multiple matching configurations changing
		the same attribute, the last one is used.

		lmb=debug [KNL] Enable lmb debug messages.
		memblock=debug [KNL] Enable memblock debug messages.

		load_ramdisk= [RAM] List of ramdisks to load from floppy
		See Documentation/blockdev/ramdisk.txt.
		@@ -2048,7 +2048,9 @@ and is between 256 and 4096 characters. It is defined in the file
		WARNING: Forcing ASPM on may cause system lockups.

		pcie_pme= [PCIE,PM] Native PCIe PME signaling options:
		off Do not use native PCIe PME signaling.
		Format: {auto\|force}[,nomsi]
		auto Use native PCIe PME signaling if the BIOS allows the
		kernel to control PCIe config registers of root ports.
		force Use native PCIe PME signaling even if the BIOS refuses
		to allow the kernel to control the relevant PCIe config
		registers.