Merge arlied/drm-next into drm-misc-next (7b47c66c) · Commits · e / devices / android_kernel_oneplus_sm7250

.gitignore

+28 −21

Original line number	Diff line number	Diff line
		@@ -7,38 +7,40 @@
		# command after changing this file, to see if there are
		# any tracked files which get ignored after the change.
		#
		# Normal rules
		# Normal rules (sorted alphabetically)
		#
		.*
		*.a
		*.bin
		*.bz2
		.c.[012].*
		*.dtb
		*.dtb.S
		*.dwo
		*.elf
		*.gcno
		*.gz
		*.i
		*.ko
		*.ll
		*.lst
		*.lz4
		*.lzma
		*.lzo
		*.mod.c
		*.o
		.o.
		*.a
		*.order
		*.patch
		*.s
		*.ko
		*.so
		*.so.dbg
		*.mod.c
		*.i
		*.lst
		*.su
		*.symtypes
		*.order
		*.elf
		*.bin
		*.tar
		*.gz
		*.bz2
		*.lzma
		*.xz
		*.lz4
		*.lzo
		*.patch
		*.gcno
		*.ll
		modules.builtin
		Module.symvers
		*.dwo
		*.su
		.c.[012].*
		modules.builtin

		#
		# Top-level generic files
		@@ -53,6 +55,11 @@ Module.symvers
		/System.map
		/Module.markers

		#
		# RPM spec file (make rpm-pkg)
		#
		/*.spec

		#
		# Debian directory (make deb-pkg)
		#

.mailmap

+9 −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>
		@@ -71,6 +73,8 @@ 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)>
		Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
		Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
		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>
		@@ -100,6 +104,8 @@ 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>
		Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
		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 +120,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 +135,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/obsolete/proc-sys-vm-nr_pdflush_threads

deleted100644 → 0

+0 −5

Original line number	Diff line number	Diff line
		What: /proc/sys/vm/nr_pdflush_threads
		Date: June 2012
		Contact: Wanpeng Li <liwp@linux.vnet.ibm.com>
		Description: Since pdflush is replaced by per-BDI flusher, the interface of old pdflush
		exported in /proc/sys/vm/ should be removed.

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.txt for more information.
		the range 0..INT_MAX. See Documentation/gpio/gpio.txt for more information.

		/sys/class/gpio
		/export ... asks the kernel to export a GPIO to userspace