Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next (6b7781b4) · Commits · e / devices / android_kernel_oneplus_sm8150

.gitignore

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,7 @@
	*.lzo		*.lzo
	*.patch		*.patch
	*.gcno		*.gcno
			*.ll
	modules.builtin		modules.builtin
	Module.symvers		Module.symvers
	*.dwo		*.dwo

.mailmap

+3 −0

CREDITS

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1034,6 +1034,10 @@ S: 2037 Walnut #6
	S: Boulder, Colorado 80302		S: Boulder, Colorado 80302
	S: USA		S: USA

			N: Hans-Christian Noren Egtvedt
			E: egtvedt@samfundet.no
			D: AVR32 architecture maintainer.

	N: Heiko Eißfeldt		N: Heiko Eißfeldt
	E: heiko@colossus.escape.de heiko@unifix.de		E: heiko@colossus.escape.de heiko@unifix.de
	D: verify_area stuff, generic SCSI fixes		D: verify_area stuff, generic SCSI fixes
	@@ -3398,6 +3402,10 @@ S: Suite 101
	S: Markham, Ontario L3R 2Z6		S: Markham, Ontario L3R 2Z6
	S: Canada		S: Canada

			N: Haavard Skinnemoen
			M: Haavard Skinnemoen <hskinnemoen@gmail.com>
			D: AVR32 architecture port to Linux and maintainer.

	N: Rick Sladkey		N: Rick Sladkey
	E: jrs@world.std.com		E: jrs@world.std.com
	D: utility hacker: Emacs, NFS server, mount, kmem-ps, UPS debugger, strace, GDB		D: utility hacker: Emacs, NFS server, mount, kmem-ps, UPS debugger, strace, GDB

Documentation/00-INDEX

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -412,6 +412,8 @@ sysctl/
	- directory with info on the /proc/sys/* files.		- directory with info on the /proc/sys/* files.
	target/		target/
	- directory with info on generating TCM v4 fabric .ko modules		- directory with info on generating TCM v4 fabric .ko modules
			tee.txt
			- info on the TEE subsystem and drivers
	this_cpu_ops.txt		this_cpu_ops.txt
	- List rationale behind and the way to use this_cpu operations.		- List rationale behind and the way to use this_cpu operations.
	thermal/		thermal/

Documentation/ABI/obsolete/sysfs-firmware-acpi

0 → 100644

+8 −0

Original line number	Original line	Diff line number	Diff line
			What: /sys/firmware/acpi/hotplug/force_remove
			Date: Mar 2017
			Contact: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
			Description:
			Since the force_remove is inherently broken and dangerous to
			use for some hotplugable resources like memory (because ignoring
			the offline failure might lead to memory corruption and crashes)
			enabling this knob is not safe and thus unsupported.

Original line number	Original line	Diff line number	Diff line
	@@ -111,6 +111,7 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com>
	Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.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> 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>
	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>
	@@ -145,6 +146,8 @@ Santosh Shilimkar <ssantosh@kernel.org>
	Santosh Shilimkar <santosh.shilimkar@oracle.org>		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>
			Sebastian Reichel <sre@kernel.org> <sre@debian.org>
			Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
	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 <shuah@kernel.org> <shuahkhan@gmail.com>
	Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>		Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>