Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f46a6804 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into perf/urgent 



Merge reason: Fix upstream breakage introduced by:

 de5d9bf6: Move list types from <linux/list.h> to <linux/types.h>.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents b3e84ffa ad41a1e0

Documentation/00-INDEX

+2 −2
Original line number Diff line number Diff line
@@ -130,8 +130,6 @@ edac.txt 
	- information on EDAC - Error Detection And Correction

eisa.txt

	- info on EISA bus support.

exception.txt

	- how Linux v2.2 handles exceptions without verify_area etc.

fault-injection/

	- dir with docs about the fault injection capabilities infrastructure.

fb/
@@ -234,6 +232,8 @@ memory.txt 
	- info on typical Linux memory problems.

mips/

	- directory with info about Linux on MIPS architecture.

mmc/

	- directory with info about the MMC subsystem

mono.txt

	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.

mutex-design.txt

Documentation/ABI/testing/debugfs-ec

0 → 100644
+20 −0
Original line number Diff line number Diff line 
What:		/sys/kernel/debug/ec/*/{gpe,use_global_lock,io}

Date:		July 2010

Contact:	Thomas Renninger <trenn@suse.de>

Description:



General information like which GPE is assigned to the EC and whether

the global lock should get used.

Knowing the EC GPE one can watch the amount of HW events related to

the EC here (XY -> GPE number from /sys/kernel/debug/ec/*/gpe):

/sys/firmware/acpi/interrupts/gpeXY



The io file is binary and a userspace tool located here:

ftp://ftp.suse.com/pub/people/trenn/sources/ec/

should get used to read out the 256 Embedded Controller registers

or writing to them.



CAUTION: Do not write to the Embedded Controller if you don't know

what you are doing! Rebooting afterwards also is a good idea.

This can influence the way your machine is cooled and fans may

not get switched on again after you did a wrong write.

Documentation/ABI/testing/sysfs-bus-i2c-devices-hm6352

0 → 100644
+21 −0
Original line number Diff line number Diff line 
Where:		/sys/bus/i2c/devices/.../heading0_input

Date:		April 2010

Kernel Version: 2.6.36?

Contact:	alan.cox@intel.com

Description:	Reports the current heading from the compass as a floating

		point value in degrees.



Where:		/sys/bus/i2c/devices/.../power_state

Date:		April 2010

Kernel Version: 2.6.36?

Contact:	alan.cox@intel.com

Description:	Sets the power state of the device. 0 sets the device into

		sleep mode, 1 wakes it up.



Where:		/sys/bus/i2c/devices/.../calibration

Date:		April 2010

Kernel Version: 2.6.36?

Contact:	alan.cox@intel.com

Description:	Sets the calibration on or off (1 = on, 0 = off). See the

		chip data sheet.

Documentation/ABI/testing/sysfs-bus-pci

+27 −0
Original line number Diff line number Diff line
@@ -139,3 +139,30 @@ Contact: linux-pci@vger.kernel.org 
Description:

		This symbolic link points to the PCI hotplug controller driver

		module that manages the hotplug slot.



What:		/sys/bus/pci/devices/.../label

Date:		July 2010

Contact:	Narendra K <narendra_k@dell.com>, linux-bugs@dell.com

Description:

		Reading this attribute will provide the firmware

		given name(SMBIOS type 41 string) of the PCI device.

		The attribute will be created only if the firmware

		has given a name to the PCI device.

Users:

		Userspace applications interested in knowing the

		firmware assigned name of the PCI device.



What:		/sys/bus/pci/devices/.../index

Date:		July 2010

Contact:	Narendra K <narendra_k@dell.com>, linux-bugs@dell.com

Description:

		Reading this attribute will provide the firmware

		given instance(SMBIOS type 41 device type instance)

		of the PCI device. The attribute will be created

		only if the firmware has given a device type instance

		to the PCI device.

Users:

		Userspace applications interested in knowing the

		firmware assigned device type instance of the PCI

		device that can help in understanding the firmware

		intended order of the PCI device.

Documentation/ABI/testing/sysfs-devices-memory

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ Description: 
		added or removed dynamically to represent hot-add/remove

		operations.

Users:		hotplug memory add/remove tools

		https://w3.opensource.ibm.com/projects/powerpc-utils/

		http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils



What:		/sys/devices/system/memory/memoryX/removable

Date:		June 2008
@@ -19,7 +19,7 @@ Description: 
		identify removable sections of the memory before attempting

		potentially expensive hot-remove memory operation

Users:		hotplug memory remove tools

		https://w3.opensource.ibm.com/projects/powerpc-utils/

		http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils	



What:		/sys/devices/system/memory/memoryX/phys_device

Date:		September 2008
@@ -58,7 +58,7 @@ Description: 
		by root to offline that section.

		# echo offline > /sys/devices/system/memory/memory22/state

Users:		hotplug memory remove tools

		https://w3.opensource.ibm.com/projects/powerpc-utils/

		http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils





What:		/sys/devices/system/memoryX/nodeY