Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/urgent

Pull EFI fixes from Matt Fleming:

 * WARN_ON(!spin_is_locked()) always triggers on non-SMP machines.
   Swap it for the more canonical lockdep_assert_held() which always
   does the right thing - Guenter Roeck

 * Assign the correct value to efi.runtime_version on arm64 so that all
   the runtime services can be invoked - Semen Protsenko

Signed-off-by: Ingo Molnar <mingo@kernel.org>

21 files changed, 718 insertions, 46 deletions

diff --git a/Documentation/ABI/testing/ima_policy b/Documentation/ABI/testing/ima_policy
index 4c3efe434806..d0d0c578324c 100644
--- a/Documentation/ABI/testing/ima_policy
+++ b/Documentation/ABI/testing/ima_policy
@@ -26,6 +26,7 @@ Description:
                         option: [[appraise_type=]] [permit_directio]
 
                 base:   func:= [BPRM_CHECK][MMAP_CHECK][FILE_CHECK][MODULE_CHECK]
+                                [FIRMWARE_CHECK]
                         mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]
                         fsmagic:= hex value
                         fsuuid:= file system UUID (e.g 8bcbe394-4f13-4144-be8e-5aa9ea2ce2f6)
@@ -57,7 +58,8 @@ Description:
                         measure func=BPRM_CHECK
                         measure func=FILE_MMAP mask=MAY_EXEC
                         measure func=FILE_CHECK mask=MAY_READ uid=0
-                        measure func=MODULE_CHECK uid=0
+                        measure func=MODULE_CHECK
+                        measure func=FIRMWARE_CHECK
                         appraise fowner=0
 
                 The default policy measures all executables in bprm_check,
diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index a9757dcf2e81..d760b0224ef7 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -260,6 +260,10 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_magn_scale
 What:           /sys/bus/iio/devices/iio:deviceX/in_magn_x_scale
 What:           /sys/bus/iio/devices/iio:deviceX/in_magn_y_scale
 What:           /sys/bus/iio/devices/iio:deviceX/in_magn_z_scale
+What:           /sys/bus/iio/devices/iio:deviceX/in_rot_from_north_magnetic_scale
+What:           /sys/bus/iio/devices/iio:deviceX/in_rot_from_north_true_scale
+What:           /sys/bus/iio/devices/iio:deviceX/in_rot_from_north_magnetic_tilt_comp_scale
+What:           /sys/bus/iio/devices/iio:deviceX/in_rot_from_north_true_tilt_comp_scale
 What:           /sys/bus/iio/devices/iio:deviceX/in_pressureY_scale
 What:           /sys/bus/iio/devices/iio:deviceX/in_pressure_scale
 KernelVersion:  2.6.35
@@ -447,6 +451,14 @@ What:		/sys/.../iio:deviceX/events/in_magn_y_thresh_rising_en
 What:           /sys/.../iio:deviceX/events/in_magn_y_thresh_falling_en
 What:           /sys/.../iio:deviceX/events/in_magn_z_thresh_rising_en
 What:           /sys/.../iio:deviceX/events/in_magn_z_thresh_falling_en
+What:           /sys/.../iio:deviceX/events/in_rot_from_north_magnetic_thresh_rising_en
+What:           /sys/.../iio:deviceX/events/in_rot_from_north_magnetic_thresh_falling_en
+What:           /sys/.../iio:deviceX/events/in_rot_from_north_true_thresh_rising_en
+What:           /sys/.../iio:deviceX/events/in_rot_from_north_true_thresh_falling_en
+What:           /sys/.../iio:deviceX/events/in_rot_from_north_magnetic_tilt_comp_thresh_rising_en
+What:           /sys/.../iio:deviceX/events/in_rot_from_north_magnetic_tilt_comp_thresh_falling_en
+What:           /sys/.../iio:deviceX/events/in_rot_from_north_true_tilt_comp_thresh_rising_en
+What:           /sys/.../iio:deviceX/events/in_rot_from_north_true_tilt_comp_thresh_falling_en
 What:           /sys/.../iio:deviceX/events/in_voltageY_supply_thresh_rising_en
 What:           /sys/.../iio:deviceX/events/in_voltageY_supply_thresh_falling_en
 What:           /sys/.../iio:deviceX/events/in_voltageY_thresh_rising_en
@@ -492,6 +504,14 @@ What:		/sys/.../iio:deviceX/events/in_magn_y_roc_rising_en
 What:           /sys/.../iio:deviceX/events/in_magn_y_roc_falling_en
 What:           /sys/.../iio:deviceX/events/in_magn_z_roc_rising_en
 What:           /sys/.../iio:deviceX/events/in_magn_z_roc_falling_en
+What:           /sys/.../iio:deviceX/events/in_rot_from_north_magnetic_roc_rising_en
+What:           /sys/.../iio:deviceX/events/in_rot_from_north_magnetic_roc_falling_en
+What:           /sys/.../iio:deviceX/events/in_rot_from_north_true_roc_rising_en
+What:           /sys/.../iio:deviceX/events/in_rot_from_north_true_roc_falling_en
+What:           /sys/.../iio:deviceX/events/in_rot_from_north_magnetic_tilt_comp_roc_rising_en
+What:           /sys/.../iio:deviceX/events/in_rot_from_north_magnetic_tilt_comp_roc_falling_en
+What:           /sys/.../iio:deviceX/events/in_rot_from_north_true_tilt_comp_roc_rising_en
+What:           /sys/.../iio:deviceX/events/in_rot_from_north_true_tilt_comp_roc_falling_en
 What:           /sys/.../iio:deviceX/events/in_voltageY_supply_roc_rising_en
 What:           /sys/.../iio:deviceX/events/in_voltageY_supply_roc_falling_en
 What:           /sys/.../iio:deviceX/events/in_voltageY_roc_rising_en
@@ -538,6 +558,14 @@ What:		/sys/.../events/in_magn_y_raw_thresh_rising_value
 What:           /sys/.../events/in_magn_y_raw_thresh_falling_value
 What:           /sys/.../events/in_magn_z_raw_thresh_rising_value
 What:           /sys/.../events/in_magn_z_raw_thresh_falling_value
+What:           /sys/.../events/in_rot_from_north_magnetic_raw_thresh_rising_value
+What:           /sys/.../events/in_rot_from_north_magnetic_raw_thresh_falling_value
+What:           /sys/.../events/in_rot_from_north_true_raw_thresh_rising_value
+What:           /sys/.../events/in_rot_from_north_true_raw_thresh_falling_value
+What:           /sys/.../events/in_rot_from_north_magnetic_tilt_comp_raw_thresh_rising_value
+What:           /sys/.../events/in_rot_from_north_magnetic_tilt_comp_raw_thresh_falling_value
+What:           /sys/.../events/in_rot_from_north_true_tilt_comp_raw_thresh_rising_value
+What:           /sys/.../events/in_rot_from_north_true_tilt_comp_raw_thresh_falling_value
 What:           /sys/.../events/in_voltageY_supply_raw_thresh_rising_value
 What:           /sys/.../events/in_voltageY_supply_raw_thresh_falling_value
 What:           /sys/.../events/in_voltageY_raw_thresh_rising_value
@@ -588,6 +616,18 @@ What:		/sys/.../events/in_magn_y_thresh_either_hysteresis
 What:           /sys/.../events/in_magn_z_thresh_rising_hysteresis
 What:           /sys/.../events/in_magn_z_thresh_falling_hysteresis
 What:           /sys/.../events/in_magn_z_thresh_either_hysteresis
+What:           /sys/.../events/in_rot_from_north_magnetic_thresh_rising_hysteresis
+What:           /sys/.../events/in_rot_from_north_magnetic_thresh_falling_hysteresis
+What:           /sys/.../events/in_rot_from_north_magnetic_thresh_either_hysteresis
+What:           /sys/.../events/in_rot_from_north_true_thresh_rising_hysteresis
+What:           /sys/.../events/in_rot_from_north_true_thresh_falling_hysteresis
+What:           /sys/.../events/in_rot_from_north_true_thresh_either_hysteresis
+What:           /sys/.../events/in_rot_from_north_magnetic_tilt_comp_thresh_rising_hysteresis
+What:           /sys/.../events/in_rot_from_north_magnetic_tilt_comp_thresh_falling_hysteresis
+What:           /sys/.../events/in_rot_from_north_magnetic_tilt_comp_thresh_either_hysteresis
+What:           /sys/.../events/in_rot_from_north_true_tilt_comp_thresh_rising_hysteresis
+What:           /sys/.../events/in_rot_from_north_true_tilt_comp_thresh_falling_hysteresis
+What:           /sys/.../events/in_rot_from_north_true_tilt_comp_thresh_either_hysteresis
 What:           /sys/.../events/in_voltageY_thresh_rising_hysteresis
 What:           /sys/.../events/in_voltageY_thresh_falling_hysteresis
 What:           /sys/.../events/in_voltageY_thresh_either_hysteresis
@@ -635,6 +675,14 @@ What:		/sys/.../events/in_magn_y_raw_roc_rising_value
 What:           /sys/.../events/in_magn_y_raw_roc_falling_value
 What:           /sys/.../events/in_magn_z_raw_roc_rising_value
 What:           /sys/.../events/in_magn_z_raw_roc_falling_value
+What:           /sys/.../events/in_rot_from_north_magnetic_raw_roc_rising_value
+What:           /sys/.../events/in_rot_from_north_magnetic_raw_roc_falling_value
+What:           /sys/.../events/in_rot_from_north_true_raw_roc_rising_value
+What:           /sys/.../events/in_rot_from_north_true_raw_roc_falling_value
+What:           /sys/.../events/in_rot_from_north_magnetic_tilt_comp_raw_roc_rising_value
+What:           /sys/.../events/in_rot_from_north_magnetic_tilt_comp_raw_roc_falling_value
+What:           /sys/.../events/in_rot_from_north_true_tilt_comp_raw_roc_rising_value
+What:           /sys/.../events/in_rot_from_north_true_tilt_comp_raw_roc_falling_value
 What:           /sys/.../events/in_voltageY_supply_raw_roc_rising_value
 What:           /sys/.../events/in_voltageY_supply_raw_roc_falling_value
 What:           /sys/.../events/in_voltageY_raw_roc_rising_value
@@ -690,6 +738,22 @@ What:		/sys/.../events/in_magn_z_thresh_rising_period
 What:           /sys/.../events/in_magn_z_thresh_falling_period
 What:           /sys/.../events/in_magn_z_roc_rising_period
 What:           /sys/.../events/in_magn_z_roc_falling_period
+What:           /sys/.../events/in_rot_from_north_magnetic_thresh_rising_period
+What:           /sys/.../events/in_rot_from_north_magnetic_thresh_falling_period
+What:           /sys/.../events/in_rot_from_north_magnetic_roc_rising_period
+What:           /sys/.../events/in_rot_from_north_magnetic_roc_falling_period
+What:           /sys/.../events/in_rot_from_north_true_thresh_rising_period
+What:           /sys/.../events/in_rot_from_north_true_thresh_falling_period
+What:           /sys/.../events/in_rot_from_north_true_roc_rising_period
+What:           /sys/.../events/in_rot_from_north_true_roc_falling_period
+What:           /sys/.../events/in_rot_from_north_magnetic_tilt_comp_thresh_rising_period
+What:           /sys/.../events/in_rot_from_north_magnetic_tilt_comp_thresh_falling_period
+What:           /sys/.../events/in_rot_from_north_magnetic_tilt_comp_roc_rising_period
+What:           /sys/.../events/in_rot_from_north_magnetic_tilt_comp_roc_falling_period
+What:           /sys/.../events/in_rot_from_north_true_tilt_comp_thresh_rising_period
+What:           /sys/.../events/in_rot_from_north_true_tilt_comp_thresh_falling_period
+What:           /sys/.../events/in_rot_from_north_true_tilt_comp_roc_rising_period
+What:           /sys/.../events/in_rot_from_north_true_tilt_comp_roc_falling_period
 What:           /sys/.../events/in_voltageY_supply_thresh_rising_period
 What:           /sys/.../events/in_voltageY_supply_thresh_falling_period
 What:           /sys/.../events/in_voltageY_supply_roc_rising_period
@@ -787,6 +851,10 @@ What:		/sys/.../iio:deviceX/scan_elements/in_anglvel_z_en
 What:           /sys/.../iio:deviceX/scan_elements/in_magn_x_en
 What:           /sys/.../iio:deviceX/scan_elements/in_magn_y_en
 What:           /sys/.../iio:deviceX/scan_elements/in_magn_z_en
+What:           /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_en
+What:           /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_en
+What:           /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_tilt_comp_en
+What:           /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_tilt_comp_en
 What:           /sys/.../iio:deviceX/scan_elements/in_timestamp_en
 What:           /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_en
 What:           /sys/.../iio:deviceX/scan_elements/in_voltageY_en
@@ -853,6 +921,10 @@ What:		/sys/.../iio:deviceX/scan_elements/in_anglvel_z_index
 What:           /sys/.../iio:deviceX/scan_elements/in_magn_x_index
 What:           /sys/.../iio:deviceX/scan_elements/in_magn_y_index
 What:           /sys/.../iio:deviceX/scan_elements/in_magn_z_index
+What:           /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_index
+What:           /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_index
+What:           /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_tilt_comp_index
+What:           /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_tilt_comp_index
 What:           /sys/.../iio:deviceX/scan_elements/in_incli_x_index
 What:           /sys/.../iio:deviceX/scan_elements/in_incli_y_index
 What:           /sys/.../iio:deviceX/scan_elements/in_timestamp_index
@@ -895,6 +967,19 @@ Description:
                 on-chip EEPROM. After power-up or chip reset the device will
                 automatically load the saved configuration.
 
+What:           /sys/.../iio:deviceX/in_proximity_raw
+What:           /sys/.../iio:deviceX/in_proximity_input
+What:           /sys/.../iio:deviceX/in_proximityY_raw
+KernelVersion:  3.4
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Proximity measurement indicating that some
+                object is near the sensor, usually be observing
+                reflectivity of infrared or ultrasound emitted.
+                Often these sensors are unit less and as such conversion
+                to SI units is not possible.  Where it is, the units should
+                be meters.
+
 What:           /sys/.../iio:deviceX/in_illuminanceY_input
 What:           /sys/.../iio:deviceX/in_illuminanceY_raw
 What:           /sys/.../iio:deviceX/in_illuminanceY_mean_raw
@@ -933,3 +1018,13 @@ Description:
                 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.
+
+What:           /sys/bus/iio/devices/iio:deviceX/in_rot_from_north_magnetic_tilt_comp_raw
+What:           /sys/bus/iio/devices/iio:deviceX/in_rot_from_north_true_tilt_comp_raw
+What:           /sys/bus/iio/devices/iio:deviceX/in_rot_from_north_magnetic_raw
+What:           /sys/bus/iio/devices/iio:deviceX/in_rot_from_north_true_raw
+KernelVersion:  3.15
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Raw value of rotation from true/magnetic north measured with
+                or without compensation from tilt sensors.
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-trigger-sysfs b/Documentation/ABI/testing/sysfs-bus-iio-trigger-sysfs
new file mode 100644
index 000000000000..5235e6c749ab
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-iio-trigger-sysfs
@@ -0,0 +1,11 @@
+What:           /sys/bus/iio/devices/triggerX/trigger_now
+KernelVersion:  2.6.38
+Contact:        linux-iio@vger.kernel.org
+Description:
+                This file is provided by the iio-trig-sysfs stand-alone trigger
+                driver. Writing this file with any value triggers an event
+                driven driver, associated with this trigger, to capture data
+                into an in kernel buffer. This approach can be valuable during
+                automated testing or in situations, where other trigger methods
+                are not applicable. For example no RTC or spare GPIOs.
+                X is the IIO index of the trigger.
diff --git a/Documentation/ABI/testing/sysfs-bus-platform b/Documentation/ABI/testing/sysfs-bus-platform
new file mode 100644
index 000000000000..5172a6124b27
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-platform
@@ -0,0 +1,20 @@
+What:           /sys/bus/platform/devices/.../driver_override
+Date:           April 2014
+Contact:        Kim Phillips <kim.phillips@freescale.com>
+Description:
+                This file allows the driver for a device to be specified which
+                will override standard OF, ACPI, ID table, and name 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 vfio-platform > \
+                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.
diff --git a/Documentation/ABI/testing/sysfs-bus-rbd b/Documentation/ABI/testing/sysfs-bus-rbd
index 501adc2a9ec7..2ddd680929d8 100644
--- a/Documentation/ABI/testing/sysfs-bus-rbd
+++ b/Documentation/ABI/testing/sysfs-bus-rbd
@@ -94,5 +94,5 @@ current_snap
 
 parent
 
-        Information identifying the pool, image, and snapshot id for
-        the parent image in a layered rbd image (format 2 only).
+        Information identifying the chain of parent images in a layered rbd
+        image.  Entries are separated by empty lines.
diff --git a/Documentation/ABI/testing/sysfs-bus-usb-lvstest b/Documentation/ABI/testing/sysfs-bus-usb-lvstest
new file mode 100644
index 000000000000..aae68fc2d842
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-usb-lvstest
@@ -0,0 +1,47 @@
+Link Layer Validation Device is a standard device for testing of Super
+Speed Link Layer tests. These nodes are available in sysfs only when lvs
+driver is bound with root hub device.
+
+What:           /sys/bus/usb/devices/.../get_dev_desc
+Date:           March 2014
+Contact:        Pratyush Anand <pratyush.anand@st.com>
+Description:
+                Write to this node to issue "Get Device Descriptor"
+                for Link Layer Validation device. It is needed for TD.7.06.
+
+What:           /sys/bus/usb/devices/.../u1_timeout
+Date:           March 2014
+Contact:        Pratyush Anand <pratyush.anand@st.com>
+Description:
+                Set "U1 timeout" for the downstream port where Link Layer
+                Validation device is connected. Timeout value must be between 0
+                and 127. It is needed for TD.7.18, TD.7.19, TD.7.20 and TD.7.21.
+
+What:           /sys/bus/usb/devices/.../u2_timeout
+Date:           March 2014
+Contact:        Pratyush Anand <pratyush.anand@st.com>
+Description:
+                Set "U2 timeout" for the downstream port where Link Layer
+                Validation device is connected. Timeout value must be between 0
+                and 127. It is needed for TD.7.18, TD.7.19, TD.7.20 and TD.7.21.
+
+What:           /sys/bus/usb/devices/.../hot_reset
+Date:           March 2014
+Contact:        Pratyush Anand <pratyush.anand@st.com>
+Description:
+                Write to this node to issue "Reset" for Link Layer Validation
+                device. It is needed for TD.7.29, TD.7.31, TD.7.34 and TD.7.35.
+
+What:           /sys/bus/usb/devices/.../u3_entry
+Date:           March 2014
+Contact:        Pratyush Anand <pratyush.anand@st.com>
+Description:
+                Write to this node to issue "U3 entry" for Link Layer
+                Validation device. It is needed for TD.7.35 and TD.7.36.
+
+What:           /sys/bus/usb/devices/.../u3_exit
+Date:           March 2014
+Contact:        Pratyush Anand <pratyush.anand@st.com>
+Description:
+                Write to this node to issue "U3 exit" for Link Layer
+                Validation device. It is needed for TD.7.36.
diff --git a/Documentation/ABI/testing/sysfs-class-iommu b/Documentation/ABI/testing/sysfs-class-iommu
new file mode 100644
index 000000000000..6d0a1b4be82d
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-class-iommu
@@ -0,0 +1,17 @@
+What:           /sys/class/iommu/<iommu>/devices/
+Date:           June 2014
+KernelVersion:  3.17
+Contact:        Alex Williamson <alex.williamson@redhat.com>
+Description:
+                IOMMU drivers are able to link devices managed by a
+                given IOMMU here to allow association of IOMMU to
+                device.
+
+What:           /sys/devices/.../iommu
+Date:           June 2014
+KernelVersion:  3.17
+Contact:        Alex Williamson <alex.williamson@redhat.com>
+Description:
+                IOMMU drivers are able to link the IOMMU for a
+                given device here to allow association of device to
+                IOMMU.
diff --git a/Documentation/ABI/testing/sysfs-class-iommu-amd-iommu b/Documentation/ABI/testing/sysfs-class-iommu-amd-iommu
new file mode 100644
index 000000000000..d6ba8e8a4a97
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-class-iommu-amd-iommu
@@ -0,0 +1,14 @@
+What:           /sys/class/iommu/<iommu>/amd-iommu/cap
+Date:           June 2014
+KernelVersion:  3.17
+Contact:        Alex Williamson <alex.williamson@redhat.com>
+Description:
+                IOMMU capability header as documented in the AMD IOMMU
+                specification.  Format: %x
+
+What:           /sys/class/iommu/<iommu>/amd-iommu/features
+Date:           June 2014
+KernelVersion:  3.17
+Contact:        Alex Williamson <alex.williamson@redhat.com>
+Description:
+                Extended features of the IOMMU.  Format: %llx
diff --git a/Documentation/ABI/testing/sysfs-class-iommu-intel-iommu b/Documentation/ABI/testing/sysfs-class-iommu-intel-iommu
new file mode 100644
index 000000000000..258cc246d98e
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-class-iommu-intel-iommu
@@ -0,0 +1,32 @@
+What:           /sys/class/iommu/<iommu>/intel-iommu/address
+Date:           June 2014
+KernelVersion:  3.17
+Contact:        Alex Williamson <alex.williamson@redhat.com>
+Description:
+                Physical address of the VT-d DRHD for this IOMMU.
+                Format: %llx.  This allows association of a sysfs
+                intel-iommu with a DMAR DRHD table entry.
+
+What:           /sys/class/iommu/<iommu>/intel-iommu/cap
+Date:           June 2014
+KernelVersion:  3.17
+Contact:        Alex Williamson <alex.williamson@redhat.com>
+Description:
+                The cached hardware capability register value
+                of this DRHD unit.  Format: %llx.
+
+What:           /sys/class/iommu/<iommu>/intel-iommu/ecap
+Date:           June 2014
+KernelVersion:  3.17
+Contact:        Alex Williamson <alex.williamson@redhat.com>
+Description:
+                The cached hardware extended capability register
+                value of this DRHD unit.  Format: %llx.
+
+What:           /sys/class/iommu/<iommu>/intel-iommu/version
+Date:           June 2014
+KernelVersion:  3.17
+Contact:        Alex Williamson <alex.williamson@redhat.com>
+Description:
+                The architecture version as reported from the
+                VT-d VER_REG.  Format: %d:%d, major:minor
diff --git a/Documentation/ABI/testing/sysfs-class-leds-gt683r b/Documentation/ABI/testing/sysfs-class-leds-gt683r
new file mode 100644
index 000000000000..e4fae6026e79
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-class-leds-gt683r
@@ -0,0 +1,16 @@
+What:           /sys/class/leds/<led>/gt683r/mode
+Date:           Jun 2014
+KernelVersion:  3.17
+Contact:        Janne Kanniainen <janne.kanniainen@gmail.com>
+Description:
+                Set the mode of LEDs. You should notice that changing the mode
+                of one LED will update the mode of its two sibling devices as
+                well.
+
+                0 - normal
+                1 - audio
+                2 - breathing
+
+                Normal: LEDs are fully on when enabled
+                Audio:  LEDs brightness depends on sound level
+                Breathing: LEDs brightness varies at human breathing rate
\ No newline at end of file
diff --git a/Documentation/ABI/testing/sysfs-class-mei b/Documentation/ABI/testing/sysfs-class-mei
new file mode 100644
index 000000000000..0ec8b8178c41
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-class-mei
@@ -0,0 +1,16 @@
+What:           /sys/class/mei/
+Date:           May 2014
+KernelVersion:  3.17
+Contact:        Tomas Winkler <tomas.winkler@intel.com>
+Description:
+                The mei/ class sub-directory belongs to mei device class
+
+
+What:           /sys/class/mei/meiN/
+Date:           May 2014
+KernelVersion:  3.17
+Contact:        Tomas Winkler <tomas.winkler@intel.com>
+Description:
+                The /sys/class/mei/meiN directory is created for
+                each probed mei device
+
diff --git a/Documentation/ABI/testing/sysfs-class-mtd b/Documentation/ABI/testing/sysfs-class-mtd
index 1399bb2da3eb..76ee192f80a0 100644
--- a/Documentation/ABI/testing/sysfs-class-mtd
+++ b/Documentation/ABI/testing/sysfs-class-mtd
@@ -184,3 +184,41 @@ Description:
 
                 It will always be a non-negative integer.  In the case of
                 devices lacking any ECC capability, it is 0.
+
+What:           /sys/class/mtd/mtdX/ecc_failures
+Date:           June 2014
+KernelVersion:  3.17
+Contact:        linux-mtd@lists.infradead.org
+Description:
+                The number of failures reported by this device's ECC. Typically,
+                these failures are associated with failed read operations.
+
+                It will always be a non-negative integer.  In the case of
+                devices lacking any ECC capability, it is 0.
+
+What:           /sys/class/mtd/mtdX/corrected_bits
+Date:           June 2014
+KernelVersion:  3.17
+Contact:        linux-mtd@lists.infradead.org
+Description:
+                The number of bits that have been corrected by means of the
+                device's ECC.
+
+                It will always be a non-negative integer.  In the case of
+                devices lacking any ECC capability, it is 0.
+
+What:           /sys/class/mtd/mtdX/bad_blocks
+Date:           June 2014
+KernelVersion:  3.17
+Contact:        linux-mtd@lists.infradead.org
+Description:
+                The number of blocks marked as bad, if any, in this partition.
+
+What:           /sys/class/mtd/mtdX/bbt_blocks
+Date:           June 2014
+KernelVersion:  3.17
+Contact:        linux-mtd@lists.infradead.org
+Description:
+                The number of blocks that are marked as reserved, if any, in
+                this partition. These are typically used to store the in-flash
+                bad block table (BBT).
diff --git a/Documentation/ABI/testing/sysfs-class-net b/Documentation/ABI/testing/sysfs-class-net
index 416c5d59f52e..d322b0581194 100644
--- a/Documentation/ABI/testing/sysfs-class-net
+++ b/Documentation/ABI/testing/sysfs-class-net
@@ -1,3 +1,14 @@
+What:           /sys/class/net/<iface>/name_assign_type
+Date:           July 2014
+KernelVersion:  3.17
+Contact:        netdev@vger.kernel.org
+Description:
+                Indicates the name assignment type. Possible values are:
+                1: enumerated by the kernel, possibly in an unpredictable way
+                2: predictably named by the kernel
+                3: named by userspace
+                4: renamed
+
 What:           /sys/class/net/<iface>/addr_assign_type
 Date:           July 2010
 KernelVersion:  3.2
diff --git a/Documentation/ABI/testing/sysfs-driver-genwqe b/Documentation/ABI/testing/sysfs-driver-genwqe
index 1870737a1f5e..64ac6d567c4b 100644
--- a/Documentation/ABI/testing/sysfs-driver-genwqe
+++ b/Documentation/ABI/testing/sysfs-driver-genwqe
@@ -25,6 +25,15 @@ Date:           Oct 2013
 Contact:        haver@linux.vnet.ibm.com
 Description:    Interface to set the next bitstream to be used.
 
+What:           /sys/class/genwqe/genwqe<n>_card/reload_bitstream
+Date:           May 2014
+Contact:        klebers@linux.vnet.ibm.com
+Description:    Interface to trigger a PCIe card reset to reload the bitstream.
+                  sudo sh -c 'echo 1 > \
+                    /sys/class/genwqe/genwqe0_card/reload_bitstream'
+                If successfully, the card will come back with the bitstream set
+                on 'next_bitstream'.
+
 What:           /sys/class/genwqe/genwqe<n>_card/tempsens
 Date:           Oct 2013
 Contact:        haver@linux.vnet.ibm.com
diff --git a/Documentation/ABI/testing/sysfs-driver-hid-lenovo-tpkbd b/Documentation/ABI/testing/sysfs-driver-hid-lenovo
index 57b92cbdceae..53a0725962e1 100644
--- a/Documentation/ABI/testing/sysfs-driver-hid-lenovo-tpkbd
+++ b/Documentation/ABI/testing/sysfs-driver-hid-lenovo
@@ -4,18 +4,21 @@ Contact:	linux-input@vger.kernel.org
 Description:    This controls if mouse clicks should be generated if the trackpoint is quickly pressed. How fast this press has to be
                 is being controlled by press_speed.
                 Values are 0 or 1.
+                Applies to Thinkpad USB Keyboard with TrackPoint.
 
 What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/dragging
 Date:           July 2011
 Contact:        linux-input@vger.kernel.org
 Description:    If this setting is enabled, it is possible to do dragging by pressing the trackpoint. This requires press_to_select to be enabled.
                 Values are 0 or 1.
+                Applies to Thinkpad USB Keyboard with TrackPoint.
 
 What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/release_to_select
 Date:           July 2011
 Contact:        linux-input@vger.kernel.org
 Description:    For details regarding this setting please refer to http://www.pc.ibm.com/ww/healthycomputing/trkpntb.html
                 Values are 0 or 1.
+                Applies to Thinkpad USB Keyboard with TrackPoint.
 
 What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/select_right
 Date:           July 2011
@@ -23,16 +26,25 @@ Contact:	linux-input@vger.kernel.org
 Description:    This setting controls if the mouse click events generated by pressing the trackpoint (if press_to_select is enabled) generate
                 a left or right mouse button click.
                 Values are 0 or 1.
+                Applies to Thinkpad USB Keyboard with TrackPoint.
 
 What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/sensitivity
 Date:           July 2011
 Contact:        linux-input@vger.kernel.org
 Description:    This file contains the trackpoint sensitivity.
                 Values are decimal integers from 1 (lowest sensitivity) to 255 (highest sensitivity).
+                Applies to Thinkpad USB Keyboard with TrackPoint.
 
 What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/press_speed
 Date:           July 2011
 Contact:        linux-input@vger.kernel.org
 Description:    This setting controls how fast the trackpoint needs to be pressed to generate a mouse click if press_to_select is enabled.
                 Values are decimal integers from 1 (slowest) to 255 (fastest).
+                Applies to Thinkpad USB Keyboard with TrackPoint.
 
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/fn_lock
+Date:           July 2014
+Contact:        linux-input@vger.kernel.org
+Description:    This setting controls whether Fn Lock is enabled on the keyboard (i.e. if F1 is Mute or F1)
+                Values are 0 or 1
+                Applies to ThinkPad Compact (USB|Bluetooth) Keyboard with TrackPoint.
diff --git a/Documentation/ABI/testing/sysfs-driver-pciback b/Documentation/ABI/testing/sysfs-driver-pciback
new file mode 100644
index 000000000000..6a733bfa37e6
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-driver-pciback
@@ -0,0 +1,13 @@
+What:           /sys/bus/pci/drivers/pciback/quirks
+Date:           Oct 2011
+KernelVersion:  3.1
+Contact:        xen-devel@lists.xenproject.org
+Description:
+                If the permissive attribute is set, then writing a string in
+                the format of DDDD:BB:DD.F-REG:SIZE:MASK will allow the guest
+                to write and read from the PCI device. That is Domain:Bus:
+                Device.Function-Register:Size:Mask (Domain is optional).
+                For example:
+                #echo 00:19.0-E0:2:FF > /sys/bus/pci/drivers/pciback/quirks
+                will allow the guest to read and write to the configuration
+                register 0x0E.
diff --git a/Documentation/ABI/testing/sysfs-driver-tegra-fuse b/Documentation/ABI/testing/sysfs-driver-tegra-fuse
new file mode 100644
index 000000000000..69f5af632657
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-driver-tegra-fuse
@@ -0,0 +1,11 @@
+What:           /sys/devices/*/<our-device>/fuse
+Date:           February 2014
+Contact:        Peter De Schrijver <pdeschrijver@nvidia.com>
+Description:    read-only access to the efuses on Tegra20, Tegra30, Tegra114
+                and Tegra124 SoC's from NVIDIA. The efuses contain write once
+                data programmed at the factory. The data is layed out in 32bit
+                words in LSB first format. Each bit represents a single value
+                as decoded from the fuse registers. Bits order/assignment
+                exactly matches the HW registers, including any unused bits.
+Users:          any user space application which wants to read the efuses on
+                Tegra SoC's
diff --git a/Documentation/ABI/testing/sysfs-driver-wacom b/Documentation/ABI/testing/sysfs-driver-wacom
index 7fc781048b79..c4f0fed64a6e 100644
--- a/Documentation/ABI/testing/sysfs-driver-wacom
+++ b/Documentation/ABI/testing/sysfs-driver-wacom
@@ -1,48 +1,27 @@
-WWhat:          /sys/class/hidraw/hidraw*/device/oled*_img
-Date:           June 2012
-Contact:        linux-bluetooth@vger.kernel.org
-Description:
-                The /sys/class/hidraw/hidraw*/device/oled*_img files control
-                OLED mocro displays on Intuos4 Wireless tablet. Accepted image
-                has to contain 256 bytes (64x32 px 1 bit colour). The format
-                is the same as PBM image 62x32px without header (64 bits per
-                horizontal line, 32 lines). An example of setting OLED No. 0:
-                dd bs=256 count=1 if=img_file of=[path to oled0_img]/oled0_img
-                The attribute is read only and no local copy of the image is
-                stored.
-
-What:           /sys/class/hidraw/hidraw*/device/speed
+What:           /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/speed
 Date:           April 2010
 Kernel Version: 2.6.35
 Contact:        linux-bluetooth@vger.kernel.org
 Description:
-                The /sys/class/hidraw/hidraw*/device/speed file controls
-                reporting speed of Wacom bluetooth tablet. Reading from
-                this file returns 1 if tablet reports in high speed mode
+                The /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/speed file
+                controls reporting speed of Wacom bluetooth tablet. Reading
+                from this file returns 1 if tablet reports in high speed mode
                 or 0 otherwise. Writing to this file one of these values
                 switches reporting speed.
 
-What:           /sys/class/leds/0005\:056A\:00BD.0001\:selector\:*/
-Date:           May 2012
-Kernel Version: 3.5
-Contact:        linux-bluetooth@vger.kernel.org
-Description:
-                LED selector for Intuos4 WL. There are 4 leds, but only one LED
-                can be lit at a time. Max brightness is 127.
-
-What:           /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/led
-Date:           August 2011
+What:           /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_led/led
+Date:           August 2014
 Contact:        linux-input@vger.kernel.org
 Description:
                 Attribute group for control of the status LEDs and the OLEDs.
                 This attribute group is only available for Intuos 4 M, L,
-                and XL (with LEDs and OLEDs), Intuos 5 (LEDs only), and Cintiq
-                21UX2 and Cintiq 24HD (LEDs only). Therefore its presence
-                implicitly signifies the presence of said LEDs and OLEDs on the
-                tablet device.
+                and XL (with LEDs and OLEDs), Intuos 4 WL, Intuos 5 (LEDs only),
+                Intuos Pro (LEDs only) and Cintiq 21UX2 and Cintiq 24HD
+                (LEDs only). Therefore its presence implicitly signifies the
+                presence of said LEDs and OLEDs on the tablet device.
 
-What:           /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status0_luminance
-Date:           August 2011
+What:           /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_led/status0_luminance
+Date:           August 2014
 Contact:        linux-input@vger.kernel.org
 Description:
                 Writing to this file sets the status LED luminance (1..127)
@@ -50,16 +29,16 @@ Description:
                 button is pressed on the stylus. This luminance level is
                 normally lower than the level when a button is pressed.
 
-What:           /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status1_luminance
-Date:           August 2011
+What:           /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_led/status1_luminance
+Date:           August 2014
 Contact:        linux-input@vger.kernel.org
 Description:
                 Writing to this file sets the status LED luminance (1..127)
                 when the stylus touches the tablet surface, or any button is
                 pressed on the stylus.
 
-What:           /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status_led0_select
-Date:           August 2011
+What:           /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_led/status_led0_select
+Date:           August 2014
 Contact:        linux-input@vger.kernel.org
 Description:
                 Writing to this file sets which one of the four (for Intuos 4
@@ -67,23 +46,23 @@ Description:
                 24HD) status LEDs is active (0..3). The other three LEDs on the
                 same side are always inactive.
 
-What:           /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status_led1_select
-Date:           September 2011
+What:           /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_led/status_led1_select
+Date:           August 2014
 Contact:        linux-input@vger.kernel.org
 Description:
                 Writing to this file sets which one of the left four (for Cintiq 21UX2
                 and Cintiq 24HD) status LEDs is active (0..3). The other three LEDs on
                 the left are always inactive.
 
-What:           /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/buttons_luminance
-Date:           August 2011
+What:           /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_led/buttons_luminance
+Date:           August 2014
 Contact:        linux-input@vger.kernel.org
 Description:
                 Writing to this file sets the overall luminance level (0..15)
                 of all eight button OLED displays.
 
-What:           /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/button<n>_rawimg
-Date:           August 2011
+What:           /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_led/button<n>_rawimg
+Date:           August 2014
 Contact:        linux-input@vger.kernel.org
 Description:
                 When writing a 1024 byte raw image in Wacom Intuos 4
@@ -93,3 +72,8 @@ Description:
                 byte chunk encodes the image data for two consecutive lines on
                 the display. The low nibble of each byte contains the first
                 line, and the high nibble contains the second line.
+                When the Wacom Intuos 4 is connected over Bluetooth, the
+                image has to contain 256 bytes (64x32 px 1 bit colour).
+                The format is also scrambled, like in the USB mode, and it can
+                be summarized by converting 76543210 into GECA6420.
+                                            HGFEDCBA      HFDB7531
diff --git a/Documentation/ABI/testing/sysfs-fs-nilfs2 b/Documentation/ABI/testing/sysfs-fs-nilfs2
new file mode 100644
index 000000000000..304ba84a973a
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-fs-nilfs2
@@ -0,0 +1,269 @@
+
+What:           /sys/fs/nilfs2/features/revision
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show current revision of NILFS file system driver.
+                This value informs about file system revision that
+                driver is ready to support.
+
+What:           /sys/fs/nilfs2/features/README
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Describe attributes of /sys/fs/nilfs2/features group.
+
+What:           /sys/fs/nilfs2/<device>/revision
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show NILFS file system revision on volume.
+                This value informs about metadata structures'
+                revision on mounted volume.
+
+What:           /sys/fs/nilfs2/<device>/blocksize
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show volume's block size in bytes.
+
+What:           /sys/fs/nilfs2/<device>/device_size
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show volume size in bytes.
+
+What:           /sys/fs/nilfs2/<device>/free_blocks
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show count of free blocks on volume.
+
+What:           /sys/fs/nilfs2/<device>/uuid
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show volume's UUID (Universally Unique Identifier).
+
+What:           /sys/fs/nilfs2/<device>/volume_name
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show volume's label.
+
+What:           /sys/fs/nilfs2/<device>/README
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Describe attributes of /sys/fs/nilfs2/<device> group.
+
+What:           /sys/fs/nilfs2/<device>/superblock/sb_write_time
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show last write time of super block in human-readable
+                format.
+
+What:           /sys/fs/nilfs2/<device>/superblock/sb_write_time_secs
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show last write time of super block in seconds.
+
+What:           /sys/fs/nilfs2/<device>/superblock/sb_write_count
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show current write count of super block.
+
+What:           /sys/fs/nilfs2/<device>/superblock/sb_update_frequency
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show/Set interval of periodical update of superblock
+                (in seconds).
+
+What:           /sys/fs/nilfs2/<device>/superblock/README
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Describe attributes of /sys/fs/nilfs2/<device>/superblock
+                group.
+
+What:           /sys/fs/nilfs2/<device>/segctor/last_pseg_block
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show start block number of the latest segment.
+
+What:           /sys/fs/nilfs2/<device>/segctor/last_seg_sequence
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show sequence value of the latest segment.
+
+What:           /sys/fs/nilfs2/<device>/segctor/last_seg_checkpoint
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show checkpoint number of the latest segment.
+
+What:           /sys/fs/nilfs2/<device>/segctor/current_seg_sequence
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show segment sequence counter.
+
+What:           /sys/fs/nilfs2/<device>/segctor/current_last_full_seg
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show index number of the latest full segment.
+
+What:           /sys/fs/nilfs2/<device>/segctor/next_full_seg
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show index number of the full segment index
+                to be used next.
+
+What:           /sys/fs/nilfs2/<device>/segctor/next_pseg_offset
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show offset of next partial segment in the current
+                full segment.
+
+What:           /sys/fs/nilfs2/<device>/segctor/next_checkpoint
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show next checkpoint number.
+
+What:           /sys/fs/nilfs2/<device>/segctor/last_seg_write_time
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show write time of the last segment in
+                human-readable format.
+
+What:           /sys/fs/nilfs2/<device>/segctor/last_seg_write_time_secs
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show write time of the last segment in seconds.
+
+What:           /sys/fs/nilfs2/<device>/segctor/last_nongc_write_time
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show write time of the last segment not for cleaner
+                operation in human-readable format.
+
+What:           /sys/fs/nilfs2/<device>/segctor/last_nongc_write_time_secs
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show write time of the last segment not for cleaner
+                operation in seconds.
+
+What:           /sys/fs/nilfs2/<device>/segctor/dirty_data_blocks_count
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show number of dirty data blocks.
+
+What:           /sys/fs/nilfs2/<device>/segctor/README
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Describe attributes of /sys/fs/nilfs2/<device>/segctor
+                group.
+
+What:           /sys/fs/nilfs2/<device>/segments/segments_number
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show number of segments on a volume.
+
+What:           /sys/fs/nilfs2/<device>/segments/blocks_per_segment
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show number of blocks in segment.
+
+What:           /sys/fs/nilfs2/<device>/segments/clean_segments
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show count of clean segments.
+
+What:           /sys/fs/nilfs2/<device>/segments/dirty_segments
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show count of dirty segments.
+
+What:           /sys/fs/nilfs2/<device>/segments/README
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Describe attributes of /sys/fs/nilfs2/<device>/segments
+                group.
+
+What:           /sys/fs/nilfs2/<device>/checkpoints/checkpoints_number
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show number of checkpoints on volume.
+
+What:           /sys/fs/nilfs2/<device>/checkpoints/snapshots_number
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show number of snapshots on volume.
+
+What:           /sys/fs/nilfs2/<device>/checkpoints/last_seg_checkpoint
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show checkpoint number of the latest segment.
+
+What:           /sys/fs/nilfs2/<device>/checkpoints/next_checkpoint
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show next checkpoint number.
+
+What:           /sys/fs/nilfs2/<device>/checkpoints/README
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Describe attributes of /sys/fs/nilfs2/<device>/checkpoints
+                group.
+
+What:           /sys/fs/nilfs2/<device>/mounted_snapshots/README
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Describe content of /sys/fs/nilfs2/<device>/mounted_snapshots
+                group.
+
+What:           /sys/fs/nilfs2/<device>/mounted_snapshots/<id>/inodes_count
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show number of inodes for snapshot.
+
+What:           /sys/fs/nilfs2/<device>/mounted_snapshots/<id>/blocks_count
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Show number of blocks for snapshot.
+
+What:           /sys/fs/nilfs2/<device>/mounted_snapshots/<id>/README
+Date:           April 2014
+Contact:        "Vyacheslav Dubeyko" <slava@dubeyko.com>
+Description:
+                Describe attributes of /sys/fs/nilfs2/<device>/mounted_snapshots/<id>
+                group.
diff --git a/Documentation/ABI/testing/sysfs-fs-xfs b/Documentation/ABI/testing/sysfs-fs-xfs
new file mode 100644
index 000000000000..ea0cc8c42093
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-fs-xfs
@@ -0,0 +1,39 @@
+What:           /sys/fs/xfs/<disk>/log/log_head_lsn
+Date:           July 2014
+KernelVersion:  3.17
+Contact:        xfs@oss.sgi.com
+Description:
+                The log sequence number (LSN) of the current head of the
+                log. The LSN is exported in "cycle:basic block" format.
+Users:          xfstests
+
+What:           /sys/fs/xfs/<disk>/log/log_tail_lsn
+Date:           July 2014
+KernelVersion:  3.17
+Contact:        xfs@oss.sgi.com
+Description:
+                The log sequence number (LSN) of the current tail of the
+                log. The LSN is exported in "cycle:basic block" format.
+
+What:           /sys/fs/xfs/<disk>/log/reserve_grant_head
+Date:           July 2014
+KernelVersion:  3.17
+Contact:        xfs@oss.sgi.com
+Description:
+                The current state of the log reserve grant head. It
+                represents the total log reservation of all currently
+                outstanding transactions. The grant head is exported in
+                "cycle:bytes" format.
+Users:          xfstests
+
+What:           /sys/fs/xfs/<disk>/log/write_grant_head
+Date:           July 2014
+KernelVersion:  3.17
+Contact:        xfs@oss.sgi.com
+Description:
+                The current state of the log write grant head. It
+                represents the total log reservation of all currently
+                oustanding transactions, including regrants due to
+                rolling transactions. The grant head is exported in
+                "cycle:bytes" format.
+Users:          xfstests
diff --git a/Documentation/ABI/testing/sysfs-tty b/Documentation/ABI/testing/sysfs-tty
index ad22fb0ee765..9eb3c2b6b040 100644
--- a/Documentation/ABI/testing/sysfs-tty
+++ b/Documentation/ABI/testing/sysfs-tty
@@ -138,3 +138,19 @@ Description:
 
                  These sysfs values expose the TIOCGSERIAL interface via
                  sysfs rather than via ioctls.
+
+What:           /sys/class/tty/ttyS0/rx_trig_bytes
+Date:           May 2014
+Contact:        Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
+Description:
+                 Shows current RX interrupt trigger bytes or sets the
+                 user specified value to change it for the FIFO buffer.
+                 Users can show or set this value regardless of opening the
+                 serial device file or not.
+
+                 The RX trigger can be set one of four kinds of values for UART
+                 serials. When users input a meaning less value to this I/F,
+                 the RX trigger is changed to the nearest lower value for the
+                 device specification. For example, when user sets 7bytes on
+                 16550A, which has 1/4/8/14 bytes trigger, the RX trigger is
+                 automatically changed to 4 bytes.