Merge drm/drm-next into drm-misc-next (bc537a9c) · Commits · e / devices / android_kernel_fairphone_FP5

.clang-format

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -382,7 +382,7 @@ IncludeIsMainRegex: '(Test)?$'
	IndentCaseLabels: false		IndentCaseLabels: false
	#IndentPPDirectives: None # Unknown to clang-format-5.0		#IndentPPDirectives: None # Unknown to clang-format-5.0
	IndentWidth: 8		IndentWidth: 8
	IndentWrappedFunctionNames: true		IndentWrappedFunctionNames: false
	JavaScriptQuotes: Leave		JavaScriptQuotes: Leave
	JavaScriptWrapImports: true		JavaScriptWrapImports: true
	KeepEmptyLinesAtTheStartOfBlocks: false		KeepEmptyLinesAtTheStartOfBlocks: false

.mailmap

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -31,6 +31,8 @@ Arnaud Patard <arnaud.patard@rtp-net.org>
	Arnd Bergmann <arnd@arndb.de>		Arnd Bergmann <arnd@arndb.de>
	Axel Dyks <xl@xlsigned.net>		Axel Dyks <xl@xlsigned.net>
	Axel Lin <axel.lin@gmail.com>		Axel Lin <axel.lin@gmail.com>
			Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
			Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
	Ben Gardner <bgardner@wabtec.com>		Ben Gardner <bgardner@wabtec.com>
	Ben M Cahill <ben.m.cahill@intel.com>		Ben M Cahill <ben.m.cahill@intel.com>
	Björn Steinbrink <B.Steinbrink@gmx.de>		Björn Steinbrink <B.Steinbrink@gmx.de>
	@@ -81,6 +83,9 @@ Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
	<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>		<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
	Jean Tourrilhes <jt@hpl.hp.com>		Jean Tourrilhes <jt@hpl.hp.com>
	Jeff Garzik <jgarzik@pretzel.yyz.us>		Jeff Garzik <jgarzik@pretzel.yyz.us>
			Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>
			Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>
			Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com>
	Jens Axboe <axboe@suse.de>		Jens Axboe <axboe@suse.de>
	Jens Osterkamp <Jens.Osterkamp@de.ibm.com>		Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
	Johan Hovold <johan@kernel.org> <jhovold@gmail.com>		Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
	@@ -154,6 +159,7 @@ Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
	Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>		Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>
	Rémi Denis-Courmont <rdenis@simphalempin.com>		Rémi Denis-Courmont <rdenis@simphalempin.com>
	Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>		Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
			Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
	Rudolf Marek <R.Marek@sh.cvut.cz>		Rudolf Marek <R.Marek@sh.cvut.cz>
	Rui Saraiva <rmps@joel.ist.utl.pt>		Rui Saraiva <rmps@joel.ist.utl.pt>
	Sachin P Sant <ssant@in.ibm.com>		Sachin P Sant <ssant@in.ibm.com>

CREDITS

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2571,6 +2571,11 @@ S: Helstorfer Str. 7
	S: D-30625 Hannover		S: D-30625 Hannover
	S: Germany		S: Germany

			N: Ron Minnich
			E: rminnich@sandia.gov
			E: rminnich@gmail.com
			D: 9p filesystem development

	N: Corey Minyard		N: Corey Minyard
	E: minyard@wf-rch.cirr.com		E: minyard@wf-rch.cirr.com
	E: minyard@mvista.com		E: minyard@mvista.com

Documentation/ABI/obsolete/sysfs-class-typec

0 → 100644

+48 −0

Original line number	Original line	Diff line number	Diff line
			These files are deprecated and will be removed. The same files are available
			under /sys/bus/typec (see Documentation/ABI/testing/sysfs-bus-typec).

			What: /sys/class/typec/<port\|partner\|cable>/<dev>/svid
			Date: April 2017
			Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com>
			Description:
			The SVID (Standard or Vendor ID) assigned by USB-IF for this
			alternate mode.

			What: /sys/class/typec/<port\|partner\|cable>/<dev>/mode<index>/
			Date: April 2017
			Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com>
			Description:
			Every supported mode will have its own directory. The name of
			a mode will be "mode<index>" (for example mode1), where <index>
			is the actual index to the mode VDO returned by Discover Modes
			USB power delivery command.

			What: /sys/class/typec/<port\|partner\|cable>/<dev>/mode<index>/description
			Date: April 2017
			Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com>
			Description:
			Shows description of the mode. The description is optional for
			the drivers, just like with the Billboard Devices.

			What: /sys/class/typec/<port\|partner\|cable>/<dev>/mode<index>/vdo
			Date: April 2017
			Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com>
			Description:
			Shows the VDO in hexadecimal returned by Discover Modes command
			for this mode.

			What: /sys/class/typec/<port\|partner\|cable>/<dev>/mode<index>/active
			Date: April 2017
			Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com>
			Description:
			Shows if the mode is active or not. The attribute can be used
			for entering/exiting the mode with partners and cable plugs, and
			with the port alternate modes it can be used for disabling
			support for specific alternate modes. Entering/exiting modes is
			supported as synchronous operation so write(2) to the attribute
			does not return until the enter/exit mode operation has
			finished. The attribute is notified when the mode is
			entered/exited so poll(2) on the attribute wakes up.
			Entering/exiting a mode will also generate uevent KOBJ_CHANGE.

			Valid values: yes, no

Documentation/ABI/stable/sysfs-bus-vmbus

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -42,6 +42,13 @@ Contact: K. Y. Srinivasan <kys@microsoft.com>
	Description: The 16 bit vendor ID of the device		Description: The 16 bit vendor ID of the device
	Users: tools/hv/lsvmbus and user level RDMA libraries		Users: tools/hv/lsvmbus and user level RDMA libraries

			What: /sys/bus/vmbus/devices/<UUID>/numa_node
			Date: Jul 2018
			KernelVersion: 4.19
			Contact: Stephen Hemminger <sthemmin@microsoft.com>
			Description: This NUMA node to which the VMBUS device is
			attached, or -1 if the node is unknown.

	What: /sys/bus/vmbus/devices/<UUID>/channels/<N>		What: /sys/bus/vmbus/devices/<UUID>/channels/<N>
	Date: September. 2017		Date: September. 2017
	KernelVersion: 4.14		KernelVersion: 4.14