Merge tag 'v4.3-rc1' into MTD -next development (db66e32e) · Commits · e / devices / android_kernel_fairphone_FP3

.get_maintainer.ignore

0 → 100644

+1 −0

Original line number	Original line	Diff line number	Diff line
			Christoph Hellwig <hch@lst.de>

.gitignore

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -36,6 +36,7 @@
	modules.builtin		modules.builtin
	Module.symvers		Module.symvers
	*.dwo		*.dwo
			*.su

	#		#
	# Top-level generic files		# Top-level generic files
	@@ -44,6 +45,7 @@ Module.symvers
	/TAGS		/TAGS
	/linux		/linux
	/vmlinux		/vmlinux
			/vmlinux.32
	/vmlinux-gdb.py		/vmlinux-gdb.py
	/vmlinuz		/vmlinuz
	/System.map		/System.map
	@@ -89,6 +91,9 @@ GRTAGS
	GSYMS		GSYMS
	GTAGS		GTAGS

			# id-utils files
			ID

	*.orig		*.orig
	*~		*~
	\#*#		\#*#
	@@ -97,6 +102,7 @@ GTAGS
	# Leavings from module signing		# Leavings from module signing
	#		#
	extra_certificates		extra_certificates
			signing_key.pem
	signing_key.priv		signing_key.priv
	signing_key.x509		signing_key.x509
	x509.genkey		x509.genkey

.mailmap

+5 −1

CREDITS

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,10 @@ D: One of assisting postmasters for vger.kernel.org's lists
	S: (ask for current address)		S: (ask for current address)
	S: Finland		S: Finland

			N: Thomas Abraham
			E: thomas.ab@samsung.com
			D: Samsung pin controller driver

	N: Dragos Acostachioaie		N: Dragos Acostachioaie
	E: dragos@iname.com		E: dragos@iname.com
	W: http://www.arbornet.org/~dragos		W: http://www.arbornet.org/~dragos
	@@ -2988,6 +2992,10 @@ S: 2200 Mission College Blvd
	S: Santa Clara, CA 95052		S: Santa Clara, CA 95052
	S: USA		S: USA

			N: Anil Ravindranath
			E: anil_ravindranath@pmc-sierra.com
			D: PMC-Sierra MaxRAID driver

	N: Eric S. Raymond		N: Eric S. Raymond
	E: esr@thyrsus.com		E: esr@thyrsus.com
	W: http://www.tuxedo.org/~esr/		W: http://www.tuxedo.org/~esr/
	@@ -3219,6 +3227,11 @@ S: 69 rue Dunois
	S: 75013 Paris		S: 75013 Paris
	S: France		S: France

			N: Aleksa Sarai
			E: cyphar@cyphar.com
			W: https://www.cyphar.com/
			D: `pids` cgroup subsystem

	N: Dipankar Sarma		N: Dipankar Sarma
	E: dipankar@in.ibm.com		E: dipankar@in.ibm.com
	D: RCU		D: RCU

Documentation/ABI/stable/sysfs-bus-vmbus

0 → 100644

+29 −0

Original line number	Original line	Diff line number	Diff line
			What: /sys/bus/vmbus/devices/vmbus_*/id
			Date: Jul 2009
			KernelVersion: 2.6.31
			Contact: K. Y. Srinivasan <kys@microsoft.com>
			Description: The VMBus child_relid of the device's primary channel
			Users: tools/hv/lsvmbus

			What: /sys/bus/vmbus/devices/vmbus_*/class_id
			Date: Jul 2009
			KernelVersion: 2.6.31
			Contact: K. Y. Srinivasan <kys@microsoft.com>
			Description: The VMBus interface type GUID of the device
			Users: tools/hv/lsvmbus

			What: /sys/bus/vmbus/devices/vmbus_*/device_id
			Date: Jul 2009
			KernelVersion: 2.6.31
			Contact: K. Y. Srinivasan <kys@microsoft.com>
			Description: The VMBus interface instance GUID of the device
			Users: tools/hv/lsvmbus

			What: /sys/bus/vmbus/devices/vmbus_*/channel_vp_mapping
			Date: Jul 2015
			KernelVersion: 4.2.0
			Contact: K. Y. Srinivasan <kys@microsoft.com>
			Description: The mapping of which primary/sub channels are bound to which
			Virtual Processors.
			Format: <channel's child_relid:the bound cpu's number>
			Users: tools/hv/lsvmbus

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@ Aleksey Gorelov <aleksey_gorelov@phoenix.com>
	Al Viro <viro@ftp.linux.org.uk>		Al Viro <viro@ftp.linux.org.uk>
	Al Viro <viro@zenIV.linux.org.uk>		Al Viro <viro@zenIV.linux.org.uk>
	Andreas Herrmann <aherrman@de.ibm.com>		Andreas Herrmann <aherrman@de.ibm.com>
			Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
	Andrew Morton <akpm@linux-foundation.org>		Andrew Morton <akpm@linux-foundation.org>
	Andrew Vasquez <andrew.vasquez@qlogic.com>		Andrew Vasquez <andrew.vasquez@qlogic.com>
	Andy Adamson <andros@citi.umich.edu>		Andy Adamson <andros@citi.umich.edu>
	@@ -116,6 +117,7 @@ Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
	Simon Kelley <simon@thekelleys.org.uk>		Simon Kelley <simon@thekelleys.org.uk>
	Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
	Stephen Hemminger <shemminger@osdl.org>		Stephen Hemminger <shemminger@osdl.org>
			Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
	Sumit Semwal <sumit.semwal@ti.com>		Sumit Semwal <sumit.semwal@ti.com>
	Tejun Heo <htejun@gmail.com>		Tejun Heo <htejun@gmail.com>
	Thomas Graf <tgraf@suug.ch>		Thomas Graf <tgraf@suug.ch>
	@@ -125,7 +127,9 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
	Uwe Kleine-König <ukl@pengutronix.de>		Uwe Kleine-König <ukl@pengutronix.de>
	Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>		Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
	Valdis Kletnieks <Valdis.Kletnieks@vt.edu>		Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
	Viresh Kumar <viresh.linux@gmail.com> <viresh.kumar@st.com>		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>
	Takashi YOSHII <takashi.yoshii.zj@renesas.com>		Takashi YOSHII <takashi.yoshii.zj@renesas.com>
	Yusuke Goda <goda.yusuke@renesas.com>		Yusuke Goda <goda.yusuke@renesas.com>
	Gustavo Padovan <gustavo@las.ic.unicamp.br>		Gustavo Padovan <gustavo@las.ic.unicamp.br>