Merge branch 'staging/for_v3.4' into v4l_for_linus (7483d45f) · Commits · 戴 / test

CREDITS

+5 −0

Original line number	Diff line number	Diff line
		@@ -514,6 +514,11 @@ S: Bessemerstraat 21
		S: Amsterdam
		S: The Netherlands

		N: NeilBrown
		E: neil@brown.name
		P: 4096R/566281B9 1BC6 29EB D390 D870 7B5F 497A 39EC 9EDD 5662 81B9
		D: NFSD Maintainer 2000-2007

		N: Zach Brown
		E: zab@zabbo.net
		D: maestro pci sound

Documentation/ABI/stable/sysfs-bus-xen-backend

0 → 100644

+75 −0

Original line number	Diff line number	Diff line
		What: /sys/bus/xen-backend/devices/*/devtype
		Date: Feb 2009
		KernelVersion: 2.6.38
		Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		The type of the device. e.g., one of: 'vbd' (block),
		'vif' (network), or 'vfb' (framebuffer).

		What: /sys/bus/xen-backend/devices/*/nodename
		Date: Feb 2009
		KernelVersion: 2.6.38
		Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		XenStore node (under /local/domain/NNN/) for this
		backend device.

		What: /sys/bus/xen-backend/devices/vbd-*/physical_device
		Date: April 2011
		KernelVersion: 3.0
		Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		The major:minor number (in hexidecimal) of the
		physical device providing the storage for this backend
		block device.

		What: /sys/bus/xen-backend/devices/vbd-*/mode
		Date: April 2011
		KernelVersion: 3.0
		Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		Whether the block device is read-only ('r') or
		read-write ('w').

		What: /sys/bus/xen-backend/devices/vbd-*/statistics/f_req
		Date: April 2011
		KernelVersion: 3.0
		Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		Number of flush requests from the frontend.

		What: /sys/bus/xen-backend/devices/vbd-*/statistics/oo_req
		Date: April 2011
		KernelVersion: 3.0
		Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		Number of requests delayed because the backend was too
		busy processing previous requests.

		What: /sys/bus/xen-backend/devices/vbd-*/statistics/rd_req
		Date: April 2011
		KernelVersion: 3.0
		Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		Number of read requests from the frontend.

		What: /sys/bus/xen-backend/devices/vbd-*/statistics/rd_sect
		Date: April 2011
		KernelVersion: 3.0
		Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		Number of sectors read by the frontend.

		What: /sys/bus/xen-backend/devices/vbd-*/statistics/wr_req
		Date: April 2011
		KernelVersion: 3.0
		Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		Number of write requests from the frontend.

		What: /sys/bus/xen-backend/devices/vbd-*/statistics/wr_sect
		Date: April 2011
		KernelVersion: 3.0
		Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		Number of sectors written by the frontend.

Documentation/ABI/stable/sysfs-devices-system-xen_memory

0 → 100644

+77 −0

Original line number	Diff line number	Diff line
		What: /sys/devices/system/xen_memory/xen_memory0/max_retry_count
		Date: May 2011
		KernelVersion: 2.6.39
		Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		The maximum number of times the balloon driver will
		attempt to increase the balloon before giving up. See
		also 'retry_count' below.
		A value of zero means retry forever and is the default one.

		What: /sys/devices/system/xen_memory/xen_memory0/max_schedule_delay
		Date: May 2011
		KernelVersion: 2.6.39
		Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		The limit that 'schedule_delay' (see below) will be
		increased to. The default value is 32 seconds.

		What: /sys/devices/system/xen_memory/xen_memory0/retry_count
		Date: May 2011
		KernelVersion: 2.6.39
		Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		The current number of times that the balloon driver
		has attempted to increase the size of the balloon.
		The default value is one. With max_retry_count being
		zero (unlimited), this means that the driver will attempt
		to retry with a 'schedule_delay' delay.

		What: /sys/devices/system/xen_memory/xen_memory0/schedule_delay
		Date: May 2011
		KernelVersion: 2.6.39
		Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		The time (in seconds) to wait between attempts to
		increase the balloon. Each time the balloon cannot be
		increased, 'schedule_delay' is increased (until
		'max_schedule_delay' is reached at which point it
		will use the max value).

		What: /sys/devices/system/xen_memory/xen_memory0/target
		Date: April 2008
		KernelVersion: 2.6.26
		Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		The target number of pages to adjust this domain's
		memory reservation to.

		What: /sys/devices/system/xen_memory/xen_memory0/target_kb
		Date: April 2008
		KernelVersion: 2.6.26
		Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		As target above, except the value is in KiB.

		What: /sys/devices/system/xen_memory/xen_memory0/info/current_kb
		Date: April 2008
		KernelVersion: 2.6.26
		Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		Current size (in KiB) of this domain's memory
		reservation.

		What: /sys/devices/system/xen_memory/xen_memory0/info/high_kb
		Date: April 2008
		KernelVersion: 2.6.26
		Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		Amount (in KiB) of high memory in the balloon.

		What: /sys/devices/system/xen_memory/xen_memory0/info/low_kb
		Date: April 2008
		KernelVersion: 2.6.26
		Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		Amount (in KiB) of low (or normal) memory in the
		balloon.

Documentation/ABI/testing/sysfs-bus-pci

+18 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,24 @@ Description:
		re-discover previously removed devices.
		Depends on CONFIG_HOTPLUG.

		What: /sys/bus/pci/devices/.../msi_irqs/
		Date: September, 2011
		Contact: Neil Horman <nhorman@tuxdriver.com>
		Description:
		The /sys/devices/.../msi_irqs directory contains a variable set
		of sub-directories, with each sub-directory being named after a
		corresponding msi irq vector allocated to that device. Each
		numbered sub-directory N contains attributes of that irq.
		Note that this directory is not created for device drivers which
		do not support msi irqs

		What: /sys/bus/pci/devices/.../msi_irqs/<N>/mode
		Date: September 2011
		Contact: Neil Horman <nhorman@tuxdriver.com>
		Description:
		This attribute indicates the mode that the irq vector named by
		the parent directory is in (msi vs. msix)

		What: /sys/bus/pci/devices/.../remove
		Date: January 2009
		Contact: Linux PCI developers <linux-pci@vger.kernel.org>

Documentation/ABI/testing/sysfs-bus-usb

+25 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,31 @@ Description:
		Write a 1 to force the device to disconnect
		(equivalent to unplugging a wired USB device).

		What: /sys/bus/usb/drivers/.../new_id
		Date: October 2011
		Contact: linux-usb@vger.kernel.org
		Description:
		Writing a device ID to this file will attempt to
		dynamically add a new device ID to a USB device driver.
		This may allow the driver to support more hardware than
		was included in the driver's static device ID support
		table at compile time. The format for the device ID is:
		idVendor idProduct bInterfaceClass.
		The vendor ID and device ID fields are required, the
		interface class is optional.
		Upon successfully adding an ID, the driver will probe
		for the device and attempt to bind to it. For example:
		# echo "8086 10f5" > /sys/bus/usb/drivers/foo/new_id

		What: /sys/bus/usb-serial/drivers/.../new_id
		Date: October 2011
		Contact: linux-usb@vger.kernel.org
		Description:
		For serial USB drivers, this attribute appears under the
		extra bus folder "usb-serial" in sysfs; apart from that
		difference, all descriptions from the entry
		"/sys/bus/usb/drivers/.../new_id" apply.

		What: /sys/bus/usb/drivers/.../remove_id
		Date: November 2009
		Contact: CHENG Renquan <rqcheng@smu.edu.sg>

Admin message