Merge branch 'linus' into core/objtool, to pick up dependent fixes (783711f0) · Commits · e / devices / android_kernel_oneplus_sm7250

.mailmap

+8 −0

Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -14,3 +14,11 @@ Description:
	Show or set the gain boost of the amp, from 0-31 range.		Show or set the gain boost of the amp, from 0-31 range.
	18 = indoors (default)		18 = indoors (default)
	14 = outdoors		14 = outdoors

			What /sys/bus/iio/devices/iio:deviceX/noise_level_tripped
			Date: May 2017
			KernelVersion: 4.13
			Contact: Matt Ranostay <matt.ranostay@konsulko.com>
			Description:
			When 1 the noise level is over the trip level and not reporting
			valid data

Documentation/ABI/testing/sysfs-class-remoteproc

+2 −2

Original line number	Original line	Diff line number	Diff line
	What: /sys/class/remoteproc/.../firmware		What: /sys/class/remoteproc/.../firmware
	Date: October 2016		Date: October 2016
	Contact: Matt Redfearn <matt.redfearn@imgtec.com>		Contact: Matt Redfearn <matt.redfearn@mips.com>
	Description: Remote processor firmware		Description: Remote processor firmware

	Reports the name of the firmware currently loaded to the		Reports the name of the firmware currently loaded to the
	@@ -11,7 +11,7 @@ Description: Remote processor firmware

	What: /sys/class/remoteproc/.../state		What: /sys/class/remoteproc/.../state
	Date: October 2016		Date: October 2016
	Contact: Matt Redfearn <matt.redfearn@imgtec.com>		Contact: Matt Redfearn <matt.redfearn@mips.com>
	Description: Remote processor state		Description: Remote processor state

	Reports the state of the remote processor, which will be one of:		Reports the state of the remote processor, which will be one of:

Documentation/ABI/testing/sysfs-kernel-mm-swap

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -14,13 +14,3 @@ Description: Enable/disable VMA based swap readahead.
	still used for tmpfs etc. other users. If set to		still used for tmpfs etc. other users. If set to
	false, the global swap readahead algorithm will be		false, the global swap readahead algorithm will be
	used for all swappable pages.		used for all swappable pages.

	What: /sys/kernel/mm/swap/vma_ra_max_order
	Date: August 2017
	Contact: Linux memory management mailing list <linux-mm@kvack.org>
	Description: The max readahead size in order for VMA based swap readahead

	VMA based swap readahead algorithm will readahead at
	most 1 << max_order pages for each readahead. The
	real readahead size for each readahead will be scaled
	according to the estimation algorithm.

Documentation/ABI/testing/sysfs-power

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -127,7 +127,7 @@ Description:

	What; /sys/power/pm_trace_dev_match		What; /sys/power/pm_trace_dev_match
	Date: October 2010		Date: October 2010
	Contact: James Hogan <james@albanarts.com>		Contact: James Hogan <jhogan@kernel.org>
	Description:		Description:
	The /sys/power/pm_trace_dev_match file contains the name of the		The /sys/power/pm_trace_dev_match file contains the name of the
	device associated with the last PM event point saved in the RTC		device associated with the last PM event point saved in the RTC

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,7 @@ Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
	Alan Cox <alan@lxorguk.ukuu.org.uk>		Alan Cox <alan@lxorguk.ukuu.org.uk>
	Alan Cox <root@hraefn.swansea.linux.org.uk>		Alan Cox <root@hraefn.swansea.linux.org.uk>
	Aleksey Gorelov <aleksey_gorelov@phoenix.com>		Aleksey Gorelov <aleksey_gorelov@phoenix.com>
			Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
	Al Viro <viro@ftp.linux.org.uk>		Al Viro <viro@ftp.linux.org.uk>
	Al Viro <viro@zenIV.linux.org.uk>		Al Viro <viro@zenIV.linux.org.uk>
	Andreas Herrmann <aherrman@de.ibm.com>		Andreas Herrmann <aherrman@de.ibm.com>
	@@ -43,6 +44,7 @@ Corey Minyard <minyard@acm.org>
	Damian Hobson-Garcia <dhobsong@igel.co.jp>		Damian Hobson-Garcia <dhobsong@igel.co.jp>
	David Brownell <david-b@pacbell.net>		David Brownell <david-b@pacbell.net>
	David Woodhouse <dwmw2@shinybook.infradead.org>		David Woodhouse <dwmw2@shinybook.infradead.org>
			Deng-Cheng Zhu <dengcheng.zhu@mips.com> <dengcheng.zhu@imgtec.com>
	Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>		Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
	Domen Puncer <domen@coderock.org>		Domen Puncer <domen@coderock.org>
	Douglas Gilbert <dougg@torque.net>		Douglas Gilbert <dougg@torque.net>
	@@ -68,6 +70,8 @@ Jacob Shin <Jacob.Shin@amd.com>
	James Bottomley <jejb@mulgrave.(none)>		James Bottomley <jejb@mulgrave.(none)>
	James Bottomley <jejb@titanic.il.steeleye.com>		James Bottomley <jejb@titanic.il.steeleye.com>
	James E Wilson <wilson@specifix.com>		James E Wilson <wilson@specifix.com>
			James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
			James Hogan <jhogan@kernel.org> <james@albanarts.com>
	James Ketrenos <jketreno@io.(none)>		James Ketrenos <jketreno@io.(none)>
	Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>		Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
	<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>		<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
	@@ -98,6 +102,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
	Linas Vepstas <linas@austin.ibm.com>		Linas Vepstas <linas@austin.ibm.com>
	Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>		Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
	Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>		Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
			Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
	Mark Brown <broonie@sirena.org.uk>		Mark Brown <broonie@sirena.org.uk>
	Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
	Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
	@@ -112,9 +117,11 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
	Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>		Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
	Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>		Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
	Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>		Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
			Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>
	Mayuresh Janorkar <mayur@ti.com>		Mayuresh Janorkar <mayur@ti.com>
	Michael Buesch <m@bues.ch>		Michael Buesch <m@bues.ch>