Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95b5c0a5 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'ras/urgent' into ras/core

Pick up urgent fix as pending patch depends on it.
parents 985c78d3 78ce2410
Loading
Loading
Loading
Loading
+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
+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.
+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.

+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.

+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"
Loading