Skip to content

Commit 9ca12e5

Browse files
gregkhgregkh
committed
Merge 6.11-rc3 into char-misc-next
We need the char/misc fixes in here as well. Signed-off-by: Greg Kroah-Hartman <[email protected]>
2 parents 5c4efc6 + 7c626ce commit 9ca12e5

File tree

588 files changed

+5972
-3305
lines changed

Some content is hidden

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

588 files changed

+5972
-3305
lines changed

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ Daniel Borkmann <[email protected]> <[email protected]>
166166
Daniel Borkmann <[email protected]> <[email protected]>
167167
David Brownell <[email protected]>
168168
David Collins <[email protected]> <[email protected]>
169+
David Heidelberg <[email protected]> <[email protected]>
169170
David Rheinsberg <[email protected]> <[email protected]>
170171
David Rheinsberg <[email protected]> <[email protected]>
171172
David Rheinsberg <[email protected]> <[email protected]>

‎Documentation/ABI/testing/sysfs-bus-i2c-devices-turris-omnia-mcu

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ Description: (RW) The front button on the Turris Omnia router can be
3232
interrupt.
3333

3434
This file switches between these two modes:
35-
- "mcu" makes the button press event be handled by the MCU to
36-
change the LEDs panel intensity.
37-
- "cpu" makes the button press event be handled by the CPU.
35+
- ``mcu`` makes the button press event be handled by the MCU to
36+
change the LEDs panel intensity.
37+
- ``cpu`` makes the button press event be handled by the CPU.
3838

3939
Format: %s.
4040

‎Documentation/admin-guide/cifs/usage.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ SecurityFlags Flags which control security negotiation and
742742
may use NTLMSSP 0x00080
743743
must use NTLMSSP 0x80080
744744
seal (packet encryption) 0x00040
745-
must seal (not implemented yet) 0x40040
745+
must seal 0x40040
746746

747747
cifsFYI If set to non-zero value, additional debug information
748748
will be logged to the system error log. This field

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4798,11 +4798,9 @@
47984798

47994799
profile= [KNL] Enable kernel profiling via /proc/profile
48004800
Format: [<profiletype>,]<number>
4801-
Param: <profiletype>: "schedule", "sleep", or "kvm"
4801+
Param: <profiletype>: "schedule" or "kvm"
48024802
[defaults to kernel profiling]
48034803
Param: "schedule" - profile schedule points.
4804-
Param: "sleep" - profile D-state sleeping (millisecs).
4805-
Requires CONFIG_SCHEDSTATS
48064804
Param: "kvm" - profile VM exits.
48074805
Param: <number> - step/bucket size as a power of 2 for
48084806
statistical time based profiling.

‎Documentation/arch/arm64/silicon-errata.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,18 @@ stable kernels.
122122
+----------------+-----------------+-----------------+-----------------------------+
123123
| ARM | Cortex-A76 | #1490853 | N/A |
124124
+----------------+-----------------+-----------------+-----------------------------+
125+
| ARM | Cortex-A76 | #3324349 | ARM64_ERRATUM_3194386 |
126+
+----------------+-----------------+-----------------+-----------------------------+
125127
| ARM | Cortex-A77 | #1491015 | N/A |
126128
+----------------+-----------------+-----------------+-----------------------------+
127129
| ARM | Cortex-A77 | #1508412 | ARM64_ERRATUM_1508412 |
128130
+----------------+-----------------+-----------------+-----------------------------+
131+
| ARM | Cortex-A77 | #3324348 | ARM64_ERRATUM_3194386 |
132+
+----------------+-----------------+-----------------+-----------------------------+
133+
| ARM | Cortex-A78 | #3324344 | ARM64_ERRATUM_3194386 |
134+
+----------------+-----------------+-----------------+-----------------------------+
135+
| ARM | Cortex-A78C | #3324346,3324347| ARM64_ERRATUM_3194386 |
136+
+----------------+-----------------+-----------------+-----------------------------+
129137
| ARM | Cortex-A710 | #2119858 | ARM64_ERRATUM_2119858 |
130138
+----------------+-----------------+-----------------+-----------------------------+
131139
| ARM | Cortex-A710 | #2054223 | ARM64_ERRATUM_2054223 |
@@ -138,8 +146,14 @@ stable kernels.
138146
+----------------+-----------------+-----------------+-----------------------------+
139147
| ARM | Cortex-A720 | #3456091 | ARM64_ERRATUM_3194386 |
140148
+----------------+-----------------+-----------------+-----------------------------+
149+
| ARM | Cortex-A725 | #3456106 | ARM64_ERRATUM_3194386 |
150+
+----------------+-----------------+-----------------+-----------------------------+
141151
| ARM | Cortex-X1 | #1502854 | N/A |
142152
+----------------+-----------------+-----------------+-----------------------------+
153+
| ARM | Cortex-X1 | #3324344 | ARM64_ERRATUM_3194386 |
154+
+----------------+-----------------+-----------------+-----------------------------+
155+
| ARM | Cortex-X1C | #3324346 | ARM64_ERRATUM_3194386 |
156+
+----------------+-----------------+-----------------+-----------------------------+
143157
| ARM | Cortex-X2 | #2119858 | ARM64_ERRATUM_2119858 |
144158
+----------------+-----------------+-----------------+-----------------------------+
145159
| ARM | Cortex-X2 | #2224489 | ARM64_ERRATUM_2224489 |
@@ -160,6 +174,8 @@ stable kernels.
160174
+----------------+-----------------+-----------------+-----------------------------+
161175
| ARM | Neoverse-N1 | #1542419 | ARM64_ERRATUM_1542419 |
162176
+----------------+-----------------+-----------------+-----------------------------+
177+
| ARM | Neoverse-N1 | #3324349 | ARM64_ERRATUM_3194386 |
178+
+----------------+-----------------+-----------------+-----------------------------+
163179
| ARM | Neoverse-N2 | #2139208 | ARM64_ERRATUM_2139208 |
164180
+----------------+-----------------+-----------------+-----------------------------+
165181
| ARM | Neoverse-N2 | #2067961 | ARM64_ERRATUM_2067961 |
@@ -170,6 +186,8 @@ stable kernels.
170186
+----------------+-----------------+-----------------+-----------------------------+
171187
| ARM | Neoverse-V1 | #1619801 | N/A |
172188
+----------------+-----------------+-----------------+-----------------------------+
189+
| ARM | Neoverse-V1 | #3324341 | ARM64_ERRATUM_3194386 |
190+
+----------------+-----------------+-----------------+-----------------------------+
173191
| ARM | Neoverse-V2 | #3324336 | ARM64_ERRATUM_3194386 |
174192
+----------------+-----------------+-----------------+-----------------------------+
175193
| ARM | Neoverse-V3 | #3312417 | ARM64_ERRATUM_3194386 |

‎Documentation/devicetree/bindings/ata/rockchip,dwc-ahci.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ properties:
3535
ports-implemented:
3636
const: 1
3737

38+
power-domains:
39+
maxItems: 1
40+
3841
sata-port@0:
3942
$ref: /schemas/ata/snps,dwc-ahci-common.yaml#/$defs/dwc-ahci-port
4043

‎Documentation/devicetree/bindings/display/panel/samsung,atna33xc20.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@ properties:
1717
oneOf:
1818
# Samsung 13.3" FHD (1920x1080 pixels) eDP AMOLED panel
1919
- const: samsung,atna33xc20
20-
# Samsung 14.5" WQXGA+ (2880x1800 pixels) eDP AMOLED panel
2120
- items:
22-
- const: samsung,atna45af01
23-
- const: samsung,atna33xc20
21+
- enum:
22+
# Samsung 14.5" WQXGA+ (2880x1800 pixels) eDP AMOLED panel
23+
- samsung,atna45af01
24+
# Samsung 14.5" 3K (2944x1840 pixels) eDP AMOLED panel
25+
- samsung,atna45dc02
26+
- const: samsung,atna33xc20
2427

2528
enable-gpios: true
2629
port: true

‎Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,11 @@ additionalProperties: false
199199

200200
examples:
201201
- |
202+
#include <dt-bindings/gpio/gpio.h>
202203
codec@1,0{
203204
compatible = "slim217,250";
204205
reg = <1 0>;
205-
reset-gpios = <&tlmm 64 0>;
206+
reset-gpios = <&tlmm 64 GPIO_ACTIVE_LOW>;
206207
slim-ifc-dev = <&wcd9340_ifd>;
207208
#sound-dai-cells = <1>;
208209
interrupt-parent = <&tlmm>;

‎Documentation/devicetree/bindings/sound/qcom,wcd937x.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ examples:
4242
pinctrl-names = "default", "sleep";
4343
pinctrl-0 = <&wcd_reset_n>;
4444
pinctrl-1 = <&wcd_reset_n_sleep>;
45-
reset-gpios = <&tlmm 83 GPIO_ACTIVE_HIGH>;
45+
reset-gpios = <&tlmm 83 GPIO_ACTIVE_LOW>;
4646
vdd-buck-supply = <&vreg_l17b_1p8>;
4747
vdd-rxtx-supply = <&vreg_l18b_1p8>;
4848
vdd-px-supply = <&vreg_l18b_1p8>;

‎Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ unevaluatedProperties: false
3434

3535
examples:
3636
- |
37+
#include <dt-bindings/gpio/gpio.h>
3738
codec {
3839
compatible = "qcom,wcd9380-codec";
39-
reset-gpios = <&tlmm 32 0>;
40+
reset-gpios = <&tlmm 32 GPIO_ACTIVE_LOW>;
4041
#sound-dai-cells = <1>;
4142
qcom,tx-device = <&wcd938x_tx>;
4243
qcom,rx-device = <&wcd938x_rx>;

0 commit comments

Comments
 (0)