Merge tag 'v3.11' into next (4ba25a49) · Commits · e / devices / android_kernel_xiaomi_markw

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ modules.builtin
		*.bz2
		*.lzma
		*.xz
		*.lz4
		*.lzo
		*.patch
		*.gcno

Documentation/00-INDEX

+2 −0

Original line number	Diff line number	Diff line
		@@ -187,6 +187,8 @@ firmware_class/
		- request_firmware() hotplug interface info.
		flexible-arrays.txt
		- how to make use of flexible sized arrays in linux
		fmc/
		- information about the FMC bus abstraction
		frv/
		- Fujitsu FR-V Linux documentation.
		futex-requeue-pi.txt

Documentation/ABI/stable/sysfs-driver-ib_srp

+7 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,13 @@ Description: Interface for making ib_srp connect to a new target.
		ib_srp. Specifying a value that exceeds cmd_sg_entries is
		only safe with partial memory descriptor list support enabled
		(allow_ext_sg=1).
		* comp_vector, a number in the range 0..n-1 specifying the
		MSI-X completion vector. Some HCA's allocate multiple (n)
		MSI-X vectors per HCA port. If the IRQ affinity masks of
		these interrupts have been configured such that each MSI-X
		interrupt is handled by a different CPU then the comp_vector
		parameter can be used to spread the SRP completion workload
		over multiple CPU's.

		What: /sys/class/infiniband_srp/srp-<hca>-<port_number>/ibdev
		Date: January 2, 2006

Documentation/ABI/stable/sysfs-module

+7 −3

Original line number	Diff line number	Diff line
		@@ -4,9 +4,13 @@ Description:

		/sys/module/MODULENAME
		The name of the module that is in the kernel. This
		module name will show up either if the module is built
		directly into the kernel, or if it is loaded as a
		dynamic module.
		module name will always show up if the module is loaded as a
		dynamic module. If it is built directly into the kernel, it
		will only show up if it has a version or at least one
		parameter.

		Note: The conditions of creation in the built-in case are not
		by design and may be removed in the future.

		/sys/module/MODULENAME/parameters
		This directory contains individual files that are each

Documentation/ABI/testing/configfs-usb-gadget

0 → 100644

+81 −0

Original line number	Diff line number	Diff line
		What: /config/usb-gadget
		Date: Jun 2013
		KenelVersion: 3.11
		Description:
		This group contains sub-groups corresponding to created
		USB gadgets.

		What: /config/usb-gadget/gadget
		Date: Jun 2013
		KenelVersion: 3.11
		Description:

		The attributes of a gadget:

		UDC - bind a gadget to UDC/unbind a gadget;
		write UDC's name found in /sys/class/udc/*
		to bind a gadget, empty string "" to unbind.

		bDeviceClass - USB device class code
		bDeviceSubClass - USB device subclass code
		bDeviceProtocol - USB device protocol code
		bMaxPacketSize0 - maximum endpoint 0 packet size
		bcdDevice - bcd device release number
		bcdUSB - bcd USB specification version number
		idProduct - product ID
		idVendor - vendor ID

		What: /config/usb-gadget/gadget/configs
		Date: Jun 2013
		KenelVersion: 3.11
		Description:
		This group contains a USB gadget's configurations

		What: /config/usb-gadget/gadget/configs/config
		Date: Jun 2013
		KernelVersion: 3.11
		Description:
		The attributes of a configuration:

		bmAttributes - configuration characteristics
		MaxPower - maximum power consumption from the bus

		What: /config/usb-gadget/gadget/configs/config/strings
		Date: Jun 2013
		KernelVersion: 3.11
		Description:
		This group contains subdirectories for language-specific
		strings for this configuration.

		What: /config/usb-gadget/gadget/configs/config/strings/language
		Date: Jun 2013
		KernelVersion: 3.11
		Description:
		The attributes:

		configuration - configuration description


		What: /config/usb-gadget/gadget/functions
		Date: Jun 2013
		KenelVersion: 3.11
		Description:
		This group contains functions available to this USB gadget.

		What: /config/usb-gadget/gadget/strings
		Date: Jun 2013
		KenelVersion: 3.11
		Description:
		This group contains subdirectories for language-specific
		strings for this gadget.

		What: /config/usb-gadget/gadget/strings/language
		Date: Jun 2013
		KenelVersion: 3.11
		Description:
		The attributes:

		serialnumber - gadget's serial number (string)
		product - gadget's product description
		manufacturer - gadget's manufacturer description