Merge 'v4.12-rc1' into MTD (c316cf67) · Commits · e / devices / android_kernel_teracube_emerald

.gitignore

+1 −0

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

.mailmap

+6 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,8 @@ 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>
		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
		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>
		@@ -109,6 +111,7 @@ 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>
		Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
		Mayuresh Janorkar <mayur@ti.com>
		Michael Buesch <m@bues.ch>
		Michel Dänzer <michel@tungstengraphics.com>
		@@ -143,6 +146,8 @@ Santosh Shilimkar <ssantosh@kernel.org>
		Santosh Shilimkar <santosh.shilimkar@oracle.org>
		Sascha Hauer <s.hauer@pengutronix.de>
		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>
		Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
		Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
		@@ -171,6 +176,7 @@ Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.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>
		Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
		Yusuke Goda <goda.yusuke@renesas.com>
		Gustavo Padovan <gustavo@las.ic.unicamp.br>
		Gustavo Padovan <padovan@profusion.mobi>

CREDITS

+8 −0

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

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

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

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

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

Documentation/00-INDEX

+2 −0

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

Documentation/ABI/obsolete/sysfs-firmware-acpi

0 → 100644

+8 −0

Original line number	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.