Commit e89c6fdf authored by NeilBrown's avatar NeilBrown
Browse files

Merge linux-block/for-4.3/core into md/for-linux 



There were a few conflicts that are fairly easy to resolve.

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
parents c3cce6cd 1081230b

.get_maintainer.ignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
Christoph Hellwig <hch@lst.de>

.mailmap

+1 −0
Original line number 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@zenIV.linux.org.uk>

Andreas Herrmann <aherrman@de.ibm.com>

Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>

Andrew Morton <akpm@linux-foundation.org>

Andrew Vasquez <andrew.vasquez@qlogic.com>

Andy Adamson <andros@citi.umich.edu>

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -3219,6 +3219,11 @@ S: 69 rue Dunois 
S: 75013 Paris

S: France



N: Aleksa Sarai

E: cyphar@cyphar.com

W: https://www.cyphar.com/

D: `pids` cgroup subsystem



N: Dipankar Sarma

E: dipankar@in.ibm.com

D: RCU

Documentation/ABI/stable/sysfs-bus-vmbus

0 → 100644
+29 −0
Original line number 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

Documentation/ABI/testing/configfs-usb-gadget-loopback

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ Description: 
		The attributes:



		qlen		- depth of loopback queue

		bulk_buflen	- buffer length
 
		buflen		- buffer length