Merge 'net-next/master' (89ef41bf) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/ABI/obsolete/sysfs-class-rfkill→Documentation/ABI/removed/sysfs-class-rfkill

+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

+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

+16 −1

Original line number	Diff line number	Diff line

		What: /sys/class/net/<iface>/batman-adv/throughput_override
		Date: Feb 2014
		Contact: Antonio Quartulli <antonio@meshcoding.com>
		description:
		Defines the throughput value to be used by B.A.T.M.A.N. V
		when estimating the link throughput using this interface.
		If the value is set to 0 then batman-adv will try to
		estimate the throughput by itself.

		What: /sys/class/net/<iface>/batman-adv/elp_interval
		Date: Feb 2014
		Contact: Linus Lüssing <linus.luessing@web.de>
		Description:
		Defines the interval in milliseconds in which batman
		sends its probing packets for link quality measurements.

		What: /sys/class/net/<iface>/batman-adv/iface_status
		Date: May 2010
		Contact: Marek Lindner <mareklindner@neomailbox.ch>
		@@ -12,4 +28,3 @@ Description:
		The /sys/class/net/<iface>/batman-adv/mesh_iface file
		displays the batman mesh interface this <iface>
		currently is associated with.

+5 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ This is the authoritative documentation on the design, interface and
		conventions of cgroup v2. It describes all userland-visible aspects
		of cgroup including core and specific controller behaviors. All
		future changes must be reflected in this document. Documentation for
		v1 is available under Documentation/cgroup-legacy/.
		v1 is available under Documentation/cgroup-v1/.

		CONTENTS

		@@ -843,6 +843,10 @@ PAGE_SIZE multiple when read back.
		Amount of memory used to cache filesystem data,
		including tmpfs and shared memory.

		sock

		Amount of memory used in network transmission buffers

		file_mapped

		Amount of cached filesystem data mapped with mmap()

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ that they are defined using standard clock bindings with following
		clock-output-names:
		- "xin24m" - crystal input - required,
		- "ext_i2s" - external I2S clock - optional,
		- "ext_gmac" - external GMAC clock - optional
		- "rmii_clkin" - external EMAC clock - optional

		Example: Clock controller node: