Merge branches 'acpica-fixes', 'acpi-pci-fixes' and 'acpi-debug-fixes' (b6d90158) · Commits · e / devices / android_kernel_fairphone_FP4

.gitignore

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -62,7 +62,7 @@ Module.symvers
	/tar-install/		/tar-install/

	#		#
	# git files that we don't want to ignore even it they are dot-files		# git files that we don't want to ignore even if they are dot-files
	#		#
	!.gitignore		!.gitignore
	!.mailmap		!.mailmap

.mailmap

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
	Andrew Morton <akpm@linux-foundation.org>		Andrew Morton <akpm@linux-foundation.org>
	Andrew Vasquez <andrew.vasquez@qlogic.com>		Andrew Vasquez <andrew.vasquez@qlogic.com>
	Andy Adamson <andros@citi.umich.edu>		Andy Adamson <andros@citi.umich.edu>
			Antoine Tenart <antoine.tenart@free-electrons.com>
	Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>		Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
	Archit Taneja <archit@ti.com>		Archit Taneja <archit@ti.com>
	Arnaud Patard <arnaud.patard@rtp-net.org>		Arnaud Patard <arnaud.patard@rtp-net.org>
	@@ -30,6 +31,9 @@ Axel Lin <axel.lin@gmail.com>
	Ben Gardner <bgardner@wabtec.com>		Ben Gardner <bgardner@wabtec.com>
	Ben M Cahill <ben.m.cahill@intel.com>		Ben M Cahill <ben.m.cahill@intel.com>
	Björn Steinbrink <B.Steinbrink@gmx.de>		Björn Steinbrink <B.Steinbrink@gmx.de>
			Boris Brezillon <boris.brezillon@free-electrons.com>
			Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com>
			Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com>
	Brian Avery <b.avery@hp.com>		Brian Avery <b.avery@hp.com>
	Brian King <brking@us.ibm.com>		Brian King <brking@us.ibm.com>
	Christoph Hellwig <hch@lst.de>		Christoph Hellwig <hch@lst.de>
	@@ -69,6 +73,7 @@ Jean Tourrilhes <jt@hpl.hp.com>
	Jeff Garzik <jgarzik@pretzel.yyz.us>		Jeff Garzik <jgarzik@pretzel.yyz.us>
	Jens Axboe <axboe@suse.de>		Jens Axboe <axboe@suse.de>
	Jens Osterkamp <Jens.Osterkamp@de.ibm.com>		Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
			John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
	John Stultz <johnstul@us.ibm.com>		John Stultz <johnstul@us.ibm.com>
	<josh@joshtriplett.org> <josh@freedesktop.org>		<josh@joshtriplett.org> <josh@freedesktop.org>
	<josh@joshtriplett.org> <josh@kernel.org>		<josh@joshtriplett.org> <josh@kernel.org>
	@@ -88,6 +93,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
	Linas Vepstas <linas@austin.ibm.com>		Linas Vepstas <linas@austin.ibm.com>
	Mark Brown <broonie@sirena.org.uk>		Mark Brown <broonie@sirena.org.uk>
	Matthieu CASTET <castet.matthieu@free.fr>		Matthieu CASTET <castet.matthieu@free.fr>
			Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> <mchehab@infradead.org> <mchehab@redhat.com> <m.chehab@samsung.com> <mchehab@osg.samsung.com> <mchehab@s-opensource.com>
	Mayuresh Janorkar <mayur@ti.com>		Mayuresh Janorkar <mayur@ti.com>
	Michael Buesch <m@bues.ch>		Michael Buesch <m@bues.ch>
	Michel Dänzer <michel@tungstengraphics.com>		Michel Dänzer <michel@tungstengraphics.com>
	@@ -121,6 +127,7 @@ Santosh Shilimkar <santosh.shilimkar@oracle.org>
	Sascha Hauer <s.hauer@pengutronix.de>		Sascha Hauer <s.hauer@pengutronix.de>
	S.Çağlar Onur <caglar@pardus.org.tr>		S.Çağlar Onur <caglar@pardus.org.tr>
	Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>		Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
			Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> <shuah.khan@hp.com> <shuahkh@osg.samsung.com> <shuah.kh@samsung.com>
	Simon Kelley <simon@thekelleys.org.uk>		Simon Kelley <simon@thekelleys.org.uk>
	Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
	Stephen Hemminger <shemminger@osdl.org>		Stephen Hemminger <shemminger@osdl.org>

CREDITS

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -649,6 +649,7 @@ D: Configure, Menuconfig, xconfig

	N: Mauro Carvalho Chehab		N: Mauro Carvalho Chehab
	E: m.chehab@samsung.org		E: m.chehab@samsung.org
			E: mchehab@osg.samsung.com
	E: mchehab@infradead.org		E: mchehab@infradead.org
	D: Media subsystem (V4L/DVB) drivers and core		D: Media subsystem (V4L/DVB) drivers and core
	D: EDAC drivers and EDAC 3.0 core rework		D: EDAC drivers and EDAC 3.0 core rework
	@@ -768,6 +769,7 @@ D: Z85230 driver
	D: Former security contact point (please use vendor-sec@lst.de)		D: Former security contact point (please use vendor-sec@lst.de)
	D: ex 2.2 maintainer		D: ex 2.2 maintainer
	D: 2.1.x modular sound		D: 2.1.x modular sound
			D: Assigned major/minor numbers maintainer at lanana.org
	S: c/o Red Hat UK Ltd		S: c/o Red Hat UK Ltd
	S: Alexandra House		S: Alexandra House
	S: Alexandra Terrace		S: Alexandra Terrace

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

+6 −5

Documentation/ABI/stable/sysfs-class-ubi

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -107,6 +107,15 @@ Contact: Artem Bityutskiy <dedekind@infradead.org>
	Description:		Description:
	Number of physical eraseblocks reserved for bad block handling.		Number of physical eraseblocks reserved for bad block handling.

			What: /sys/class/ubi/ubiX/ro_mode
			Date: April 2016
			KernelVersion: 4.7
			Contact: linux-mtd@lists.infradead.org
			Description:
			Contains ASCII "1\n" if the read-only flag is set on this
			device, and "0\n" if it is cleared. UBI devices mark themselves
			as read-only when they detect an unrecoverable error.

	What: /sys/class/ubi/ubiX/total_eraseblocks		What: /sys/class/ubi/ubiX/total_eraseblocks
	Date: July 2006		Date: July 2006
	KernelVersion: 2.6.22		KernelVersion: 2.6.22

Original line number	Original line	Diff line number	Diff line
	@@ -3,9 +3,10 @@ Date: Mai 2012
	Contact: Stefan Achatz <erazor_de@users.sourceforge.net>		Contact: Stefan Achatz <erazor_de@users.sourceforge.net>
	Description: The mouse can store 5 profiles which can be switched by the		Description: The mouse can store 5 profiles which can be switched by the
	press of a button. A profile is split into general settings and		press of a button. A profile is split into general settings and
	button settings. buttons holds informations about button layout.		button settings. The buttons variable holds information about
	When written, this file lets one write the respective profile		button layout. When written, this file lets one write the
	buttons to the mouse. The data has to be 47 bytes long.		respective profile buttons to the mouse. The data has to be
			47 bytes long.
	The mouse will reject invalid data.		The mouse will reject invalid data.
	Which profile to write is determined by the profile number		Which profile to write is determined by the profile number
	contained in the data.		contained in the data.
	@@ -26,8 +27,8 @@ Date: Mai 2012
	Contact: Stefan Achatz <erazor_de@users.sourceforge.net>		Contact: Stefan Achatz <erazor_de@users.sourceforge.net>
	Description: The mouse can store 5 profiles which can be switched by the		Description: The mouse can store 5 profiles which can be switched by the
	press of a button. A profile is split into general settings and		press of a button. A profile is split into general settings and
	button settings. profile holds informations like resolution, sensitivity		button settings. A profile holds information like resolution,
	and light effects.		sensitivity and light effects.
	When written, this file lets one write the respective profile		When written, this file lets one write the respective profile
	settings back to the mouse. The data has to be 43 bytes long.		settings back to the mouse. The data has to be 43 bytes long.
	The mouse will reject invalid data.		The mouse will reject invalid data.