Merge branches 'for-4.6/upstream-fixes', 'for-4.7/asus', 'for-4.7/hidraw' and... (27fd38c5) · Commits · e / devices / android_kernel_oneplus_sm7250

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ Björn Steinbrink <B.Steinbrink@gmx.de>
		Brian Avery <b.avery@hp.com>
		Brian King <brking@us.ibm.com>
		Christoph Hellwig <hch@lst.de>
		Christophe Ricard <christophe.ricard@gmail.com>
		Corey Minyard <minyard@acm.org>
		Damian Hobson-Garcia <dhobsong@igel.co.jp>
		David Brownell <david-b@pacbell.net>

+1 −0

+13 −0

Original line number	Diff line number	Diff line
		@@ -2,28 +2,12 @@ rfkill - radio frequency (RF) connector kill switch support

		For details to this subsystem look at Documentation/rfkill.txt.

		What: /sys/class/rfkill/rfkill[0-9]+/state
		Date: 09-Jul-2007
		KernelVersion v2.6.22
		Contact: linux-wireless@vger.kernel.org
		Description: Current state of the transmitter.
		This file is deprecated and scheduled to be removed in 2014,
		because its not possible to express the 'soft and hard block'
		state of the rfkill driver.
		Values: A numeric value.
		0: RFKILL_STATE_SOFT_BLOCKED
		transmitter is turned off by software
		1: RFKILL_STATE_UNBLOCKED
		transmitter is (potentially) active
		2: RFKILL_STATE_HARD_BLOCKED
		transmitter is forced off by something outside of
		the driver's control.

		What: /sys/class/rfkill/rfkill[0-9]+/claim
		Date: 09-Jul-2007
		KernelVersion v2.6.22
		Contact: linux-wireless@vger.kernel.org
		Description: This file is deprecated because there no longer is a way to
		Description: This file was deprecated because there no longer was a way to
		claim just control over a single rfkill instance.
		This file is scheduled to be removed in 2012.
		This file was scheduled to be removed in 2012, and was removed
		in 2016.
		Values: 0: Kernel handles events

+2 −1

Original line number	Diff line number	Diff line
		@@ -100,4 +100,5 @@ Description:

		Users: libraw1394
		libdc1394
		tools like jujuutils, fwhack, ...
		libhinawa
		tools like linux-firewire-utils, fwhack, ...

+24 −3

Original line number	Diff line number	Diff line
		@@ -2,9 +2,8 @@ rfkill - radio frequency (RF) connector kill switch support

		For details to this subsystem look at Documentation/rfkill.txt.

		For the deprecated /sys/class/rfkill/*/state and
		/sys/class/rfkill/*/claim knobs of this interface look in
		Documentation/ABI/obsolete/sysfs-class-rfkill.
		For the deprecated /sys/class/rfkill/*/claim knobs of this interface look in
		Documentation/ABI/removed/sysfs-class-rfkill.

		What: /sys/class/rfkill
		Date: 09-Jul-2007
		@@ -42,6 +41,28 @@ Values: A numeric value.
		1: true


		What: /sys/class/rfkill/rfkill[0-9]+/state
		Date: 09-Jul-2007
		KernelVersion v2.6.22
		Contact: linux-wireless@vger.kernel.org
		Description: Current state of the transmitter.
		This file was scheduled to be removed in 2014, but due to its
		large number of users it will be sticking around for a bit
		longer. Despite it being marked as stabe, the newer "hard" and
		"soft" interfaces should be preffered, since it is not possible
		to express the 'soft and hard block' state of the rfkill driver
		through this interface. There will likely be another attempt to
		remove it in the future.
		Values: A numeric value.
		0: RFKILL_STATE_SOFT_BLOCKED
		transmitter is turned off by software
		1: RFKILL_STATE_UNBLOCKED
		transmitter is (potentially) active
		2: RFKILL_STATE_HARD_BLOCKED
		transmitter is forced off by something outside of
		the driver's control.


		What: /sys/class/rfkill/rfkill[0-9]+/hard
		Date: 12-March-2010
		KernelVersion v2.6.34