Merge branch 'linus' into x86/platform, to refresh the branch (b5cd3b51) · Commits · e / devices / android_kernel_xiaomi_nabu

.mailmap

+6 −0

Original line number	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 <root@hraefn.swansea.linux.org.uk>
		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@zenIV.linux.org.uk>
		Andreas Herrmann <aherrman@de.ibm.com>
		@@ -43,6 +44,7 @@ Corey Minyard <minyard@acm.org>
		Damian Hobson-Garcia <dhobsong@igel.co.jp>
		David Brownell <david-b@pacbell.net>
		David Woodhouse <dwmw2@shinybook.infradead.org>
		Deng-Cheng Zhu <dengcheng.zhu@mips.com> <dengcheng.zhu@imgtec.com>
		Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
		Domen Puncer <domen@coderock.org>
		Douglas Gilbert <dougg@torque.net>
		@@ -100,6 +102,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.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@ascom.ch>
		Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
		Mark Brown <broonie@sirena.org.uk>
		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
		@@ -114,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> <matt.ranostay@intel.com>
		Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
		Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>
		Mayuresh Janorkar <mayur@ti.com>
		Michael Buesch <m@bues.ch>
		Michel Dänzer <michel@tungstengraphics.com>
		Miodrag Dinic <miodrag.dinic@mips.com> <miodrag.dinic@imgtec.com>
		Mitesh shah <mshah@teja.com>
		Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>
		Morten Welinder <terra@gnome.org>
		@@ -127,6 +132,7 @@ Mythri P K <mythripk@ti.com>
		Nguyen Anh Quynh <aquynh@gmail.com>
		Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
		Patrick Mochel <mochel@digitalimplant.org>
		Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
		Peter A Jonsson <pj@ludd.ltu.se>
		Peter Oruba <peter@oruba.de>
		Peter Oruba <peter.oruba@amd.com>

CREDITS

+8 −1

Original line number	Diff line number	Diff line
		@@ -2113,6 +2113,10 @@ S: J. Obrechtstr 23
		S: NL-5216 GP 's-Hertogenbosch
		S: The Netherlands

		N: Ashley Lai
		E: ashleydlai@gmail.com
		D: IBM VTPM driver

		N: Savio Lam
		E: lam836@cs.cuhk.hk
		D: Author of the dialog utility, foundation
		@@ -3333,6 +3337,10 @@ S: Braunschweiger Strasse 79
		S: 31134 Hildesheim
		S: Germany

		N: Marcel Selhorst
		E: tpmdd@selhorst.net
		D: TPM driver

		N: Darren Senn
		E: sinster@darkwater.com
		D: Whatever I notice needs doing (so far: itimers, /proc)
		@@ -4128,7 +4136,6 @@ D: MD driver
		D: EISA/sysfs subsystem
		S: France


		# Don't add your name here, unless you really _are_ after Marc
		# alphabetically. Leonard used to be very proud of being the
		# last entry, and he'll get positively pissed if he can't even

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -14,3 +14,11 @@ Description:
		Show or set the gain boost of the amp, from 0-31 range.
		18 = indoors (default)
		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	Diff line number	Diff line
		What: /sys/class/remoteproc/.../firmware
		Date: October 2016
		Contact: Matt Redfearn <matt.redfearn@imgtec.com>
		Contact: Matt Redfearn <matt.redfearn@mips.com>
		Description: Remote processor firmware

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

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

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

Documentation/core-api/kernel-api.rst

+0 −14

Original line number	Diff line number	Diff line
		@@ -352,44 +352,30 @@ Read-Copy Update (RCU)
		----------------------

		.. kernel-doc:: include/linux/rcupdate.h
		:external:

		.. kernel-doc:: include/linux/rcupdate_wait.h
		:external:

		.. kernel-doc:: include/linux/rcutree.h
		:external:

		.. kernel-doc:: kernel/rcu/tree.c
		:external:

		.. kernel-doc:: kernel/rcu/tree_plugin.h
		:external:

		.. kernel-doc:: kernel/rcu/tree_exp.h
		:external:

		.. kernel-doc:: kernel/rcu/update.c
		:external:

		.. kernel-doc:: include/linux/srcu.h
		:external:

		.. kernel-doc:: kernel/rcu/srcutree.c
		:external:

		.. kernel-doc:: include/linux/rculist_bl.h
		:external:

		.. kernel-doc:: include/linux/rculist.h
		:external:

		.. kernel-doc:: include/linux/rculist_nulls.h
		:external:

		.. kernel-doc:: include/linux/rcu_sync.h
		:external:

		.. kernel-doc:: kernel/rcu/sync.c
		:external: