Commit c049ffb3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.17-rc6 into usb-next 



We want the bug fixes and this resolves the merge issues with the usbip
driver.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents baf12d6d 771c577c

Documentation/ABI/testing/sysfs-class-cxl

+8 −0
Original line number Diff line number Diff line
@@ -244,3 +244,11 @@ Description: read only 
                Returns 1 if the psl timebase register is synchronized

                with the core timebase register, 0 otherwise.

Users:          https://github.com/ibm-capi/libcxl



What:           /sys/class/cxl/<card>/tunneled_ops_supported

Date:           May 2018

Contact:        linuxppc-dev@lists.ozlabs.org

Description:    read only

                Returns 1 if tunneled operations are supported in capi mode,

                0 otherwise.

Users:          https://github.com/ibm-capi/libcxl

Documentation/admin-guide/pm/intel_pstate.rst

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ feature enabled.] 


In this mode ``intel_pstate`` registers utilization update callbacks with the

CPU scheduler in order to run a P-state selection algorithm, either

``powersave`` or ``performance``, depending on the ``scaling_cur_freq`` policy

``powersave`` or ``performance``, depending on the ``scaling_governor`` policy

setting in ``sysfs``.  The current CPU frequency information to be made

available from the ``scaling_cur_freq`` policy attribute in ``sysfs`` is

periodically updated by those utilization update callbacks too.

Documentation/admin-guide/pm/sleep-states.rst

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Sleep States That Can Be Supported 
==================================



Depending on its configuration and the capabilities of the platform it runs on,

the Linux kernel can support up to four system sleep states, includig

the Linux kernel can support up to four system sleep states, including

hibernation and up to three variants of system suspend.  The sleep states that

can be supported by the kernel are listed below.

Documentation/device-mapper/thin-provisioning.txt

+4 −1
Original line number Diff line number Diff line
@@ -264,7 +264,10 @@ i) Constructor 
			   data device, but just remove the mapping.



      read_only: Don't allow any changes to be made to the pool

		 metadata.

		 metadata.  This mode is only available after the

		 thin-pool has been created and first used in full

		 read/write mode.  It cannot be specified on initial

		 thin-pool creation.



      error_if_no_space: Error IOs, instead of queueing, if no space.

Documentation/devicetree/bindings/ata/ahci-platform.txt

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ compatible: 
Optional properties:

- dma-coherent      : Present if dma operations are coherent

- clocks            : a list of phandle + clock specifier pairs

- resets            : a list of phandle + reset specifier pairs

- target-supply     : regulator for SATA target power

- phys              : reference to the SATA PHY node

- phy-names         : must be "sata-phy"

CRA Git | Maintained and supported by SUSTech CRA and CCSE