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

Commit 37766c29 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Alistair Delva
Browse files

Merge 5.3.0-rc1 into android-mainline 



Linus 5.3-rc1 release

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic171e37d4c21ffa495240c5538852bbb5a9dcce8
parents 3578eb5f 5f9e832c

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
*.lz4

*.lzma

*.lzo

*.mod

*.mod.c

*.o

*.o.*

CREDITS

+2 −3
Original line number Diff line number Diff line
@@ -1770,7 +1770,6 @@ S: USA 


N: Dave Jones

E: davej@codemonkey.org.uk

W: http://www.codemonkey.org.uk

D: Assorted VIA x86 support.

D: 2.5 AGPGART overhaul.

D: CPUFREQ maintenance.
@@ -1800,7 +1799,7 @@ S: 2300 Copenhagen S. 
S: Denmark



N: Jozsef Kadlecsik

E: kadlec@blackhole.kfki.hu

E: kadlec@netfilter.org

P: 1024D/470DB964 4CB3 1A05 713E 9BF7 FAC5  5809 DD8C B7B1 470D B964

D: netfilter: TCP window tracking code

D: netfilter: raw table
@@ -3120,7 +3119,7 @@ S: France 
N: Rik van Riel

E: riel@redhat.com

W: http://www.surriel.com/

D: Linux-MM site, Documentation/sysctl/*, swap/mm readaround

D: Linux-MM site, Documentation/admin-guide/sysctl/*, swap/mm readaround

D: kswapd fixes, random kernel hacker, rmap VM,

D: nl.linux.org administrator, minor scheduler additions

S: Red Hat Boston

Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Description: It is possible to switch the cpi setting of the mouse with the 
		press of a button.

		When read, this file returns the raw number of the actual cpi

		setting reported by the mouse. This number has to be further

		processed to receive the real dpi value.

		processed to receive the real dpi value:



		VALUE DPI

		1     400

Documentation/ABI/obsolete/sysfs-gpio

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Description: 
  Kernel code may export it for complete or partial access.



  GPIOs are identified as they are inside the kernel, using integers in

  the range 0..INT_MAX.  See Documentation/gpio for more information.

  the range 0..INT_MAX.  See Documentation/admin-guide/gpio for more information.



    /sys/class/gpio

	/export ... asks the kernel to export a GPIO to userspace

Documentation/ABI/removed/sysfs-class-rfkill

+1 −1
Original line number Diff line number Diff line 
rfkill - radio frequency (RF) connector kill switch support



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

For details to this subsystem look at Documentation/driver-api/rfkill.rst.



What:		/sys/class/rfkill/rfkill[0-9]+/claim

Date:		09-Jul-2007