Commit 95cd2ea7 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/urgent, to be able to merge a dependent fix 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 66c117d7 e713c80a

.get_maintainer.ignore

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

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

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

+1 −1
Original line number Diff line number Diff line
@@ -9,4 +9,4 @@ Description: 
		isoc_maxpacket	- 0 - 1023 (fs), 0 - 1024 (hs/ss)

		isoc_mult	- 0..2 (hs/ss only)

		isoc_maxburst	- 0..15 (ss only)

		qlen		- buffer length
 
		buflen		- buffer length

Documentation/ABI/testing/sysfs-bus-coresight-devices-etm3x

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ KernelVersion: 3.19 
Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>

Description: 	(RW) Mask to apply to all the context ID comparator.



What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/ctxid_val

What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/ctxid_pid

Date:		November 2014

KernelVersion:	3.19

Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>