Skip to content

Commit 95b5c0a

Browse files
committed
Merge branch 'ras/urgent' into ras/core
Pick up urgent fix as pending patch depends on it.
2 parents 985c78d + 78ce241 commit 95b5c0a

File tree

407 files changed

+3998
-1957
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

407 files changed

+3998
-1957
lines changed

Documentation/ABI/testing/sysfs-class-cxl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,3 +244,11 @@ Description: read only
244244
Returns 1 if the psl timebase register is synchronized
245245
with the core timebase register, 0 otherwise.
246246
Users: https://github.com/ibm-capi/libcxl
247+
248+
What: /sys/class/cxl/<card>/tunneled_ops_supported
249+
Date: May 2018
250+
251+
Description: read only
252+
Returns 1 if tunneled operations are supported in capi mode,
253+
0 otherwise.
254+
Users: https://github.com/ibm-capi/libcxl

Documentation/admin-guide/pm/intel_pstate.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ feature enabled.]
145145

146146
In this mode ``intel_pstate`` registers utilization update callbacks with the
147147
CPU scheduler in order to run a P-state selection algorithm, either
148-
``powersave`` or ``performance``, depending on the ``scaling_cur_freq`` policy
148+
``powersave`` or ``performance``, depending on the ``scaling_governor`` policy
149149
setting in ``sysfs``. The current CPU frequency information to be made
150150
available from the ``scaling_cur_freq`` policy attribute in ``sysfs`` is
151151
periodically updated by those utilization update callbacks too.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Sleep States That Can Be Supported
1515
==================================
1616

1717
Depending on its configuration and the capabilities of the platform it runs on,
18-
the Linux kernel can support up to four system sleep states, includig
18+
the Linux kernel can support up to four system sleep states, including
1919
hibernation and up to three variants of system suspend. The sleep states that
2020
can be supported by the kernel are listed below.
2121

Documentation/device-mapper/thin-provisioning.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,10 @@ i) Constructor
264264
data device, but just remove the mapping.
265265

266266
read_only: Don't allow any changes to be made to the pool
267-
metadata.
267+
metadata. This mode is only available after the
268+
thin-pool has been created and first used in full
269+
read/write mode. It cannot be specified on initial
270+
thin-pool creation.
268271

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

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ compatible:
3030
Optional properties:
3131
- dma-coherent : Present if dma operations are coherent
3232
- clocks : a list of phandle + clock specifier pairs
33-
- resets : a list of phandle + reset specifier pairs
3433
- target-supply : regulator for SATA target power
3534
- phys : reference to the SATA PHY node
3635
- phy-names : must be "sata-phy"

Documentation/devicetree/bindings/display/panel/panel-common.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Display Timings
3838
require specific display timings. The panel-timing subnode expresses those
3939
timings as specified in the timing subnode section of the display timing
4040
bindings defined in
41-
Documentation/devicetree/bindings/display/display-timing.txt.
41+
Documentation/devicetree/bindings/display/panel/display-timing.txt.
4242

4343

4444
Connectivity

Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Required Properties:
2626
- "renesas,dmac-r8a7794" (R-Car E2)
2727
- "renesas,dmac-r8a7795" (R-Car H3)
2828
- "renesas,dmac-r8a7796" (R-Car M3-W)
29+
- "renesas,dmac-r8a77965" (R-Car M3-N)
2930
- "renesas,dmac-r8a77970" (R-Car V3M)
3031
- "renesas,dmac-r8a77980" (R-Car V3H)
3132

Documentation/devicetree/bindings/net/can/rcar_canfd.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ Required properties:
55
- compatible: Must contain one or more of the following:
66
- "renesas,rcar-gen3-canfd" for R-Car Gen3 compatible controller.
77
- "renesas,r8a7795-canfd" for R8A7795 (R-Car H3) compatible controller.
8-
- "renesas,r8a7796-canfd" for R8A7796 (R-Car M3) compatible controller.
8+
- "renesas,r8a7796-canfd" for R8A7796 (R-Car M3-W) compatible controller.
9+
- "renesas,r8a77970-canfd" for R8A77970 (R-Car V3M) compatible controller.
10+
- "renesas,r8a77980-canfd" for R8A77980 (R-Car V3H) compatible controller.
911

1012
When compatible with the generic version, nodes must list the
1113
SoC-specific version corresponding to the platform first, followed by the

Documentation/devicetree/bindings/net/renesas,ravb.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Required properties:
1818

1919
- "renesas,etheravb-r8a7795" for the R8A7795 SoC.
2020
- "renesas,etheravb-r8a7796" for the R8A7796 SoC.
21+
- "renesas,etheravb-r8a77965" for the R8A77965 SoC.
2122
- "renesas,etheravb-r8a77970" for the R8A77970 SoC.
2223
- "renesas,etheravb-r8a77980" for the R8A77980 SoC.
2324
- "renesas,etheravb-r8a77995" for the R8A77995 SoC.

Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ pins it needs, and how they should be configured, with regard to muxer
5656
configuration, drive strength and pullups. If one of these options is
5757
not set, its actual value will be unspecified.
5858

59-
This driver supports the generic pin multiplexing and configuration
60-
bindings. For details on each properties, you can refer to
61-
./pinctrl-bindings.txt.
59+
Allwinner A1X Pin Controller supports the generic pin multiplexing and
60+
configuration bindings. For details on each properties, you can refer to
61+
./pinctrl-bindings.txt.
6262

6363
Required sub-node properties:
6464
- pins

0 commit comments

Comments
 (0)