Merge branch 'master' into for-linus (ab11b487) · Commits · e / devices / android_kernel_oneplus_sm8150

Documentation/00-INDEX

+4 −2

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

Documentation/ABI/testing/debugfs-ec

0 → 100644

+20 −0

Original line number	Original line	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-devices-memory

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -7,7 +7,7 @@ Description:
	added or removed dynamically to represent hot-add/remove		added or removed dynamically to represent hot-add/remove
	operations.		operations.
	Users: hotplug memory add/remove tools		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		What: /sys/devices/system/memory/memoryX/removable
	Date: June 2008		Date: June 2008
	@@ -19,7 +19,7 @@ Description:
	identify removable sections of the memory before attempting		identify removable sections of the memory before attempting
	potentially expensive hot-remove memory operation		potentially expensive hot-remove memory operation
	Users: hotplug memory remove tools		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		What: /sys/devices/system/memory/memoryX/phys_device
	Date: September 2008		Date: September 2008
	@@ -58,7 +58,7 @@ Description:
	by root to offline that section.		by root to offline that section.
	# echo offline > /sys/devices/system/memory/memory22/state		# echo offline > /sys/devices/system/memory/memory22/state
	Users: hotplug memory remove tools		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		What: /sys/devices/system/memoryX/nodeY

Documentation/ABI/testing/sysfs-devices-system-cpu

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -197,7 +197,7 @@ Description: These files exist in every cpu's cache index directories.
	Currently, only AMD Family 10h Processors support cache index		Currently, only AMD Family 10h Processors support cache index
	disable, and only for their L3 caches. See the BIOS and		disable, and only for their L3 caches. See the BIOS and
	Kernel Developer's Guide at		Kernel Developer's Guide at
	http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/31116-Public-GH-BKDG_3.20_2-4-09.pdf		http://support.amd.com/us/Embedded_TechDocs/31116-Public-GH-BKDG_3-28_5-28-09.pdf
	for formatting information and other details on the		for formatting information and other details on the
	cache index disable.		cache index disable.
	Users: joachim.deguara@amd.com		Users: joachim.deguara@amd.com

Documentation/ABI/testing/sysfs-driver-hid-roccat-kone

+0 −13

Original line number	Original line	Diff line number	Diff line
	@@ -33,19 +33,6 @@ Description: When read, this file returns the raw integer version number of the
	left. E.g. a returned value of 138 means 1.38		left. E.g. a returned value of 138 means 1.38
	This file is readonly.		This file is readonly.

	What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/kone_driver_version
	Date: March 2010
	Contact: Stefan Achatz <erazor_de@users.sourceforge.net>
	Description: When read, this file returns the driver version.
	The format of the string is "v<major>.<minor>.<patchlevel>".
	This attribute is used by the userland tools to find the sysfs-
	paths of installed kone-mice and determine the capabilites of
	the driver. Versions of this driver for old kernels replace
	usbhid instead of generic-usb. The way to scan for this file
	has been chosen to provide a consistent way for all supported
	kernel versions.
	This file is readonly.

	What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/profile[1-5]		What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/profile[1-5]
	Date: March 2010		Date: March 2010
	Contact: Stefan Achatz <erazor_de@users.sourceforge.net>		Contact: Stefan Achatz <erazor_de@users.sourceforge.net>