Skip to content

Commit 94e14da

Browse files
committed
Merge 5.5-rc2 into driver-core-next
We need the driver core fixes in here as well. Signed-off-by: Greg Kroah-Hartman <[email protected]>
2 parents 5367601 + d1eef1c commit 94e14da

File tree

423 files changed

+3026
-1847
lines changed

Some content is hidden

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

423 files changed

+3026
-1847
lines changed

.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,3 +276,5 @@ Gustavo Padovan <[email protected]>
276276
Gustavo Padovan <[email protected]>
277277
278278
279+
280+

Documentation/admin-guide/device-mapper/dm-integrity.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ journal_crypt:algorithm(:key) (the key is optional)
144144
Encrypt the journal using given algorithm to make sure that the
145145
attacker can't read the journal. You can use a block cipher here
146146
(such as "cbc(aes)") or a stream cipher (for example "chacha20",
147-
"salsa20", "ctr(aes)" or "ecb(arc4)").
147+
"salsa20" or "ctr(aes)").
148148

149149
The journal contains history of last writes to the block device,
150150
an attacker reading the journal could see the last sector nubmers

Documentation/admin-guide/device-mapper/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Device Mapper
88
cache-policies
99
cache
1010
delay
11+
dm-clone
1112
dm-crypt
1213
dm-dust
1314
dm-flakey

Documentation/devicetree/bindings/arm/sunxi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Allwinner platforms device tree bindings
88

99
maintainers:
1010
- Chen-Yu Tsai <[email protected]>
11-
- Maxime Ripard <[email protected]>
11+
- Maxime Ripard <[email protected]>
1212

1313
properties:
1414
$nodename:

Documentation/devicetree/bindings/bus/allwinner,sun50i-a64-de2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Allwinner A64 Display Engine Bus Device Tree Bindings
88

99
maintainers:
1010
- Chen-Yu Tsai <[email protected]>
11-
- Maxime Ripard <[email protected]>
11+
- Maxime Ripard <[email protected]>
1212

1313
properties:
1414
$nodename:

Documentation/devicetree/bindings/bus/allwinner,sun8i-a23-rsb.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Allwinner A23 RSB Device Tree Bindings
88

99
maintainers:
1010
- Chen-Yu Tsai <[email protected]>
11-
- Maxime Ripard <[email protected]>
11+
- Maxime Ripard <[email protected]>
1212

1313
properties:
1414
"#address-cells":

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Allwinner Clock Control Unit Device Tree Bindings
88

99
maintainers:
1010
- Chen-Yu Tsai <[email protected]>
11-
- Maxime Ripard <[email protected]>
11+
- Maxime Ripard <[email protected]>
1212

1313
properties:
1414
"#clock-cells":

Documentation/devicetree/bindings/crypto/allwinner,sun4i-a10-crypto.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Allwinner A10 Security System Device Tree Bindings
88

99
maintainers:
1010
- Chen-Yu Tsai <[email protected]>
11-
- Maxime Ripard <[email protected]>
11+
- Maxime Ripard <[email protected]>
1212

1313
properties:
1414
compatible:

Documentation/devicetree/bindings/display/allwinner,sun6i-a31-mipi-dsi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Allwinner A31 MIPI-DSI Controller Device Tree Bindings
88

99
maintainers:
1010
- Chen-Yu Tsai <[email protected]>
11-
- Maxime Ripard <[email protected]>
11+
- Maxime Ripard <[email protected]>
1212

1313
properties:
1414
"#address-cells": true

Documentation/devicetree/bindings/display/panel/ronbo,rb070d30.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Ronbo RB070D30 DSI Display Panel
88

99
maintainers:
10-
- Maxime Ripard <[email protected]>
10+
- Maxime Ripard <[email protected]>
1111

1212
properties:
1313
compatible:

0 commit comments

Comments
 (0)