Commit 3f17ea6d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' (accumulated 3.16 merge window patches) into master 

Now that 3.15 is released, this merges the 'next' branch into 'master',
bringing us to the normal situation where my 'master' branch is the
merge window.

* accumulated work in next: (6809 commits)
  ufs: sb mutex merge + mutex_destroy
  powerpc: update comments for generic idle conversion
  cris: update comments for generic idle conversion
  idle: remove cpu_idle() forward declarations
  nbd: zero from and len fields in NBD_CMD_DISCONNECT.
  mm: convert some level-less printks to pr_*
  MAINTAINERS: adi-buildroot-devel is moderated
  MAINTAINERS: add linux-api for review of API/ABI changes
  mm/kmemleak-test.c: use pr_fmt for logging
  fs/dlm/debug_fs.c: replace seq_printf by seq_puts
  fs/dlm/lockspace.c: convert simple_str to kstr
  fs/dlm/config.c: convert simple_str to kstr
  mm: mark remap_file_pages() syscall as deprecated
  mm: memcontrol: remove unnecessary memcg argument from soft limit functions
  mm: memcontrol: clean up memcg zoneinfo lookup
  mm/memblock.c: call kmemleak directly from memblock_(alloc|free)
  mm/mempool.c: update the kmemleak stack trace for mempool allocations
  lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations
  mm: introduce kmemleak_update_trace()
  mm/kmemleak.c: use %u to print ->checksum
  ...
parents 1860e379 1a5700bc

Documentation/ABI/testing/configfs-usb-gadget

+45 −0
Original line number Diff line number Diff line
@@ -62,6 +62,40 @@ KernelVersion: 3.11 
Description:

		This group contains functions available to this USB gadget.



What:		/config/usb-gadget/gadget/functions/<func>.<inst>/interface.<n>

Date:		May 2014

KernelVersion:	3.16

Description:

		This group contains "Feature Descriptors" specific for one

		gadget's USB interface or one interface group described

		by an IAD.



		The attributes:



		compatible_id		- 8-byte string for "Compatible ID"

		sub_compatible_id	- 8-byte string for "Sub Compatible ID"



What:		/config/usb-gadget/gadget/functions/<func>.<inst>/interface.<n>/<property>

Date:		May 2014

KernelVersion:	3.16

Description:

		This group contains "Extended Property Descriptors" specific for one

		gadget's USB interface or one interface group described

		by an IAD.



		The attributes:



		type		- value 1..7 for interpreting the data

				1: unicode string

				2: unicode string with environment variable

				3: binary

				4: little-endian 32-bit

				5: big-endian 32-bit

				6: unicode string with a symbolic link

				7: multiple unicode strings

		data		- blob of data to be interpreted depending on

				type



What:		/config/usb-gadget/gadget/strings

Date:		Jun 2013

KernelVersion:	3.11
@@ -79,3 +113,14 @@ Description: 
		product		- gadget's product description

		manufacturer	- gadget's manufacturer description



What:		/config/usb-gadget/gadget/os_desc

Date:		May 2014

KernelVersion:	3.16

Description:

		This group contains "OS String" extension handling attributes.



		use		- flag turning "OS Desctiptors" support on/off

		b_vendor_code	- one-byte value used for custom per-device and

				per-interface requests

		qw_sign		- an identifier to be reported as "OS String"

				proper

Documentation/ABI/testing/sysfs-bus-iio

+44 −2
Original line number Diff line number Diff line
@@ -114,14 +114,17 @@ What: /sys/bus/iio/devices/iio:deviceX/in_temp_raw 
What:		/sys/bus/iio/devices/iio:deviceX/in_tempX_raw

What:		/sys/bus/iio/devices/iio:deviceX/in_temp_x_raw

What:		/sys/bus/iio/devices/iio:deviceX/in_temp_y_raw

What:		/sys/bus/iio/devices/iio:deviceX/in_temp_z_raw

What:		/sys/bus/iio/devices/iio:deviceX/in_temp_ambient_raw

What:		/sys/bus/iio/devices/iio:deviceX/in_temp_object_raw

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:

		Raw (unscaled no bias removal etc.) temperature measurement.

		If an axis is specified it generally means that the temperature

		sensor is associated with one part of a compound device (e.g.

		a gyroscope axis). Units after application of scale and offset

		a gyroscope axis). The ambient and object modifiers distinguish

		between ambient (reference) and distant temperature for contact-

		less measurements. Units after application of scale and offset

		are milli degrees Celsius.



What:		/sys/bus/iio/devices/iio:deviceX/in_tempX_input
@@ -210,6 +213,14 @@ Contact: linux-iio@vger.kernel.org 
Description:

		Scaled humidity measurement in milli percent.



What:		/sys/bus/iio/devices/iio:deviceX/in_X_mean_raw

KernelVersion:	3.5

Contact:	linux-iio@vger.kernel.org

Description:

		Averaged raw measurement from channel X. The number of values

		used for averaging is device specific. The converting rules for

		normal raw values also applies to the averaged raw values.



What:		/sys/bus/iio/devices/iio:deviceX/in_accel_offset

What:		/sys/bus/iio/devices/iio:deviceX/in_accel_x_offset

What:		/sys/bus/iio/devices/iio:deviceX/in_accel_y_offset
@@ -784,6 +795,7 @@ What: /sys/.../iio:deviceX/scan_elements/in_incli_x_en 
What:		/sys/.../iio:deviceX/scan_elements/in_incli_y_en

What:		/sys/.../iio:deviceX/scan_elements/in_pressureY_en

What:		/sys/.../iio:deviceX/scan_elements/in_pressure_en

What:		/sys/.../iio:deviceX/scan_elements/in_rot_quaternion_en

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:
@@ -799,6 +811,7 @@ What: /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_type 
What:		/sys/.../iio:deviceX/scan_elements/in_timestamp_type

What:		/sys/.../iio:deviceX/scan_elements/in_pressureY_type

What:		/sys/.../iio:deviceX/scan_elements/in_pressure_type

What:		/sys/.../iio:deviceX/scan_elements/in_rot_quaternion_type

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:
@@ -845,6 +858,7 @@ What: /sys/.../iio:deviceX/scan_elements/in_incli_y_index 
What:		/sys/.../iio:deviceX/scan_elements/in_timestamp_index

What:		/sys/.../iio:deviceX/scan_elements/in_pressureY_index

What:		/sys/.../iio:deviceX/scan_elements/in_pressure_index

What:		/sys/.../iio:deviceX/scan_elements/in_rot_quaternion_index

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:
@@ -881,6 +895,25 @@ Description: 
		on-chip EEPROM. After power-up or chip reset the device will

		automatically load the saved configuration.



What:		/sys/.../iio:deviceX/in_illuminanceY_input

What:		/sys/.../iio:deviceX/in_illuminanceY_raw

What:		/sys/.../iio:deviceX/in_illuminanceY_mean_raw

KernelVersion:	3.4

Contact:	linux-iio@vger.kernel.org

Description:

		Illuminance measurement, units after application of scale

		and offset are lux.



What:		/sys/.../iio:deviceX/in_intensityY_raw

What:		/sys/.../iio:deviceX/in_intensityY_ir_raw

What:		/sys/.../iio:deviceX/in_intensityY_both_raw

KernelVersion:	3.4

Contact:	linux-iio@vger.kernel.org

Description:

		Unit-less light intensity. Modifiers both and ir indicate

		that measurements contains visible and infrared light

		components or just infrared light, respectively.



What:		/sys/.../iio:deviceX/in_intensity_red_integration_time

What:		/sys/.../iio:deviceX/in_intensity_green_integration_time

What:		/sys/.../iio:deviceX/in_intensity_blue_integration_time
@@ -891,3 +924,12 @@ Contact: linux-iio@vger.kernel.org 
Description:

		This attribute is used to get/set the integration time in

		seconds.



What:		/sys/bus/iio/devices/iio:deviceX/in_rot_quaternion_raw

KernelVersion:	3.15

Contact:	linux-iio@vger.kernel.org

Description:

		Raw value of quaternion components using a format

		x y z w. Here x, y, and z component represents the axis about

		which a rotation will occur and w component represents the

		amount of rotation.

Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935

0 → 100644
+16 −0
Original line number Diff line number Diff line 
What		/sys/bus/iio/devices/iio:deviceX/in_proximity_raw

Date:		March 2014

KernelVersion:	3.15

Contact:	Matt Ranostay <mranostay@gmail.com>

Description:

		Get the current distance in meters of storm (1km steps)

		1000-40000 = distance in meters



What		/sys/bus/iio/devices/iio:deviceX/sensor_sensitivity

Date:		March 2014

KernelVersion:	3.15

Contact:	Matt Ranostay <mranostay@gmail.com>

Description:

		Show or set the gain boost of the amp, from 0-31 range.

		18 = indoors (default)

		14 = outdoors

Documentation/ABI/testing/sysfs-bus-pci

+21 −0
Original line number Diff line number Diff line
@@ -250,3 +250,24 @@ Description: 
		valid.  For example, writing a 2 to this file when sriov_numvfs

		is not 0 and not 2 already will return an error. Writing a 10

		when the value of sriov_totalvfs is 8 will return an error.



What:		/sys/bus/pci/devices/.../driver_override

Date:		April 2014

Contact:	Alex Williamson <alex.williamson@redhat.com>

Description:

		This file allows the driver for a device to be specified which

		will override standard static and dynamic ID matching.  When

		specified, only a driver with a name matching the value written

		to driver_override will have an opportunity to bind to the

		device.  The override is specified by writing a string to the

		driver_override file (echo pci-stub > driver_override) and

		may be cleared with an empty string (echo > driver_override).

		This returns the device to standard matching rules binding.

		Writing to driver_override does not automatically unbind the

		device from its current driver or make any attempt to

		automatically load the specified driver.  If no driver with a

		matching name is currently loaded in the kernel, the device

		will not bind to any driver.  This also allows devices to

		opt-out of driver binding using a driver_override name such as

		"none".  Only a single driver may be specified in the override,

		there is no support for parsing delimiters.

Documentation/ABI/testing/sysfs-devices-system-cpu

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ Description: Discover cpuidle policy and mechanism 


What:		/sys/devices/system/cpu/cpu#/cpufreq/*

Date:		pre-git history

Contact:	cpufreq@vger.kernel.org

Contact:	linux-pm@vger.kernel.org

Description:	Discover and change clock speed of CPUs



		Clock scaling allows you to change the clock speed of the
@@ -146,7 +146,7 @@ Description: Discover and change clock speed of CPUs 


What:		/sys/devices/system/cpu/cpu#/cpufreq/freqdomain_cpus

Date:		June 2013

Contact:	cpufreq@vger.kernel.org

Contact:	linux-pm@vger.kernel.org

Description:	Discover CPUs in the same CPU frequency coordination domain



		freqdomain_cpus is the list of CPUs (online+offline) that share

CRA Git | Maintained and supported by SUSTech CRA and CCSE