Merge branch 'next' into for-linus (f26e8817) · Commits · e / devices / android_kernel_oneplus_sm7250

.cocciconfig

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		[spatch]
		options = --timeout 200
		options = --use-gitgrep

.gitignore

+3 −1

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ modules.builtin
		Module.symvers
		*.dwo
		*.su
		.c.[012].*

		#
		# Top-level generic files
		@@ -62,10 +63,11 @@ Module.symvers
		/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
		!.mailmap
		!.cocciconfig

		#
		# Generated include files

.mailmap

+24 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ Aaron Durbin <adurbin@google.com>
		Adam Oldham <oldhamca@gmail.com>
		Adam Radford <aradford@gmail.com>
		Adrian Bunk <bunk@stusta.de>
		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>
		@@ -21,6 +22,7 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
		Andrew Morton <akpm@linux-foundation.org>
		Andrew Vasquez <andrew.vasquez@qlogic.com>
		Andy Adamson <andros@citi.umich.edu>
		Antoine Tenart <antoine.tenart@free-electrons.com>
		Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
		Archit Taneja <archit@ti.com>
		Arnaud Patard <arnaud.patard@rtp-net.org>
		@@ -30,6 +32,9 @@ Axel Lin <axel.lin@gmail.com>
		Ben Gardner <bgardner@wabtec.com>
		Ben M Cahill <ben.m.cahill@intel.com>
		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 King <brking@us.ibm.com>
		Christoph Hellwig <hch@lst.de>
		@@ -64,6 +69,7 @@ James Bottomley <jejb@mulgrave.(none)>
		James Bottomley <jejb@titanic.il.steeleye.com>
		James E Wilson <wilson@specifix.com>
		James Ketrenos <jketreno@io.(none)>
		Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
		<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
		Jean Tourrilhes <jt@hpl.hp.com>
		Jeff Garzik <jgarzik@pretzel.yyz.us>
		@@ -83,12 +89,24 @@ Kay Sievers <kay.sievers@vrfy.org>
		Kenneth W Chen <kenneth.w.chen@intel.com>
		Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
		Koushik <raghavendra.koushik@neterion.com>
		Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
		Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
		Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
		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>
		Mark Brown <broonie@sirena.org.uk>
		Matthieu CASTET <castet.matthieu@free.fr>
		Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>
		Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>
		Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@infradead.org>
		Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com>
		Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>
		Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com>
		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>
		Mayuresh Janorkar <mayur@ti.com>
		Michael Buesch <m@bues.ch>
		Michel Dänzer <michel@tungstengraphics.com>
		@@ -122,6 +140,10 @@ Santosh Shilimkar <santosh.shilimkar@oracle.org>
		Sascha Hauer <s.hauer@pengutronix.de>
		S.Çağlar Onur <caglar@pardus.org.tr>
		Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
		Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
		Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
		Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>
		Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
		Simon Kelley <simon@thekelleys.org.uk>
		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
		Stephen Hemminger <shemminger@osdl.org>
		@@ -138,6 +160,8 @@ Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
		Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
		Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
		Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
		Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
		Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
		Takashi YOSHII <takashi.yoshii.zj@renesas.com>
		Yusuke Goda <goda.yusuke@renesas.com>
		Gustavo Padovan <gustavo@las.ic.unicamp.br>

CREDITS

+2 −0

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

		N: Mauro Carvalho Chehab
		E: m.chehab@samsung.org
		E: mchehab@osg.samsung.com
		E: mchehab@infradead.org
		D: Media subsystem (V4L/DVB) drivers and core
		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: ex 2.2 maintainer
		D: 2.1.x modular sound
		D: Assigned major/minor numbers maintainer at lanana.org
		S: c/o Red Hat UK Ltd
		S: Alexandra House
		S: Alexandra Terrace

Documentation/.gitignore

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		output
		*.pyc