Merge branch 'next' into for-linus (42249094) · Commits · e / devices / android_kernel_fairphone_FP4

.gitignore

+1 −0

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

CREDITS

+7 −8

Original line number	Diff line number	Diff line
		@@ -637,14 +637,13 @@ S: 14509 NE 39th Street #1096
		S: Bellevue, Washington 98007
		S: USA

		N: Christopher L. Cheney
		E: ccheney@debian.org
		E: ccheney@cheney.cx
		W: http://www.cheney.cx
		N: Chris Cheney
		E: chris.cheney@gmail.com
		E: ccheney@redhat.com
		P: 1024D/8E384AF2 2D31 1927 87D7 1F24 9FF9 1BC5 D106 5AB3 8E38 4AF2
		D: Vista Imaging usb webcam driver
		S: 314 Prince of Wales
		S: Conroe, TX 77304
		S: 2308 Therrell Way
		S: McKinney, TX 75070
		S: USA

		N: Stuart Cheshire
		@@ -1120,6 +1119,7 @@ D: author of userfs filesystem
		D: Improved mmap and munmap handling
		D: General mm minor tidyups
		D: autofs v4 maintainer
		D: Xen subsystem
		S: 987 Alabama St
		S: San Francisco
		S: CA, 94110
		@@ -2808,8 +2808,7 @@ S: Ottawa, Ontario
		S: Canada K2P 0X8

		N: Mikael Pettersson
		E: mikpe@it.uu.se
		W: http://user.it.uu.se/~mikpe/linux/
		E: mikpelinux@gmail.com
		D: Miscellaneous fixes

		N: Reed H. Petty

Documentation/00-INDEX

+3 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ IPMI.txt
		IRQ-affinity.txt
		- how to select which CPU(s) handle which interrupt events on SMP.
		IRQ-domain.txt
		- info on inerrupt numbering and setting up IRQ domains.
		- info on interrupt numbering and setting up IRQ domains.
		IRQ.txt
		- description of what an IRQ is.
		Intel-IOMMU.txt
		@@ -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-bus-usb

0 → 100644

+142 −0

Original line number	Diff line number	Diff line
		What: /sys/bus/usb/devices/.../power/persist
		Date: May 2007
		KernelVersion: 2.6.23
		Contact: Alan Stern <stern@rowland.harvard.edu>
		Description:
		If CONFIG_USB_PERSIST is set, then each USB device directory
		will contain a file named power/persist. The file holds a
		boolean value (0 or 1) indicating whether or not the
		"USB-Persist" facility is enabled for the device. Since the
		facility is inherently dangerous, it is disabled by default
		for all devices except hubs. For more information, see
		Documentation/usb/persist.txt.

		What: /sys/bus/usb/devices/.../power/autosuspend
		Date: March 2007
		KernelVersion: 2.6.21
		Contact: Alan Stern <stern@rowland.harvard.edu>
		Description:
		Each USB device directory will contain a file named
		power/autosuspend. This file holds the time (in seconds)
		the device must be idle before it will be autosuspended.
		0 means the device will be autosuspended as soon as
		possible. Negative values will prevent the device from
		being autosuspended at all, and writing a negative value
		will resume the device if it is already suspended.

		The autosuspend delay for newly-created devices is set to
		the value of the usbcore.autosuspend module parameter.

		What: /sys/bus/usb/device/.../power/connected_duration
		Date: January 2008
		KernelVersion: 2.6.25
		Contact: Sarah Sharp <sarah.a.sharp@intel.com>
		Description:
		If CONFIG_PM_RUNTIME is enabled then this file
		is present. When read, it returns the total time (in msec)
		that the USB device has been connected to the machine. This
		file is read-only.
		Users:
		PowerTOP <power@bughost.org>
		http://www.lesswatts.org/projects/powertop/

		What: /sys/bus/usb/device/.../power/active_duration
		Date: January 2008
		KernelVersion: 2.6.25
		Contact: Sarah Sharp <sarah.a.sharp@intel.com>
		Description:
		If CONFIG_PM_RUNTIME is enabled then this file
		is present. When read, it returns the total time (in msec)
		that the USB device has been active, i.e. not in a suspended
		state. This file is read-only.

		Tools can use this file and the connected_duration file to
		compute the percentage of time that a device has been active.
		For example,
		echo $((100 * `cat active_duration` / `cat connected_duration`))
		will give an integer percentage. Note that this does not
		account for counter wrap.
		Users:
		PowerTOP <power@bughost.org>
		http://www.lesswatts.org/projects/powertop/

		What: /sys/bus/usb/devices/<busnum>-<port[.port]>...:<config num>-<interface num>/supports_autosuspend
		Date: January 2008
		KernelVersion: 2.6.27
		Contact: Sarah Sharp <sarah.a.sharp@intel.com>
		Description:
		When read, this file returns 1 if the interface driver
		for this interface supports autosuspend. It also
		returns 1 if no driver has claimed this interface, as an
		unclaimed interface will not stop the device from being
		autosuspended if all other interface drivers are idle.
		The file returns 0 if autosuspend support has not been
		added to the driver.
		Users:
		USB PM tool
		git://git.moblin.org/users/sarah/usb-pm-tool/

		What: /sys/bus/usb/device/.../avoid_reset_quirk
		Date: December 2009
		Contact: Oliver Neukum <oliver@neukum.org>
		Description:
		Writing 1 to this file tells the kernel that this
		device will morph into another mode when it is reset.
		Drivers will not use reset for error handling for
		such devices.
		Users:
		usb_modeswitch

		What: /sys/bus/usb/devices/.../devnum
		KernelVersion: since at least 2.6.18
		Description:
		Device address on the USB bus.
		Users:
		libusb

		What: /sys/bus/usb/devices/.../bConfigurationValue
		KernelVersion: since at least 2.6.18
		Description:
		bConfigurationValue of the active configuration for the
		device. Writing 0 or -1 to bConfigurationValue will reset the
		active configuration (unconfigure the device). Writing
		another value will change the active configuration.

		Note that some devices, in violation of the USB spec, have a
		configuration with a value equal to 0. Writing 0 to
		bConfigurationValue for these devices will install that
		configuration, rather then unconfigure the device.

		Writing -1 will always unconfigure the device.
		Users:
		libusb

		What: /sys/bus/usb/devices/.../busnum
		KernelVersion: 2.6.22
		Description:
		Bus-number of the USB-bus the device is connected to.
		Users:
		libusb

		What: /sys/bus/usb/devices/.../descriptors
		KernelVersion: 2.6.26
		Description:
		Binary file containing cached descriptors of the device. The
		binary data consists of the device descriptor followed by the
		descriptors for each configuration of the device.
		Note that the wTotalLength of the config descriptors can not
		be trusted, as the device may have a smaller config descriptor
		than it advertises. The bLength field of each (sub) descriptor
		can be trusted, and can be used to seek forward one (sub)
		descriptor at a time until the next config descriptor is found.
		All descriptors read from this file are in bus-endian format
		Users:
		libusb

		What: /sys/bus/usb/devices/.../speed
		KernelVersion: since at least 2.6.18
		Description:
		Speed the device is connected with to the usb-host in
		Mbit / second. IE one of 1.5 / 12 / 480 / 5000.
		Users:
		libusb

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