Skip to content

Commit ed63ba1

Browse files
gregkhgregkh
committed
Merge 6.9-rc7 into char-misc-testing
We need the char-misc changes in here as well. Signed-off-by: Greg Kroah-Hartman <[email protected]>
2 parents 5015f8a + dd5a440 commit ed63ba1

File tree

604 files changed

+5998
-3089
lines changed

Some content is hidden

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

604 files changed

+5998
-3089
lines changed

‎.mailmap‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@ Alexei Starovoitov <[email protected]> <[email protected]>
3838
Alexei Starovoitov <[email protected]> <[email protected]>
3939
Alexei Starovoitov <[email protected]> <[email protected]>
4040
Alexey Makhalov <[email protected]> <[email protected]>
41+
Alex Elder <[email protected]>
42+
Alex Elder <[email protected]> <[email protected]>
43+
Alex Elder <[email protected]> <[email protected]>
44+
Alex Elder <[email protected]> <[email protected]>
45+
Alex Elder <[email protected]> <[email protected]>
46+
Alex Elder <[email protected]> <[email protected]>
47+
Alex Elder <[email protected]> <[email protected]>
48+
Alex Elder <[email protected]> <[email protected]>
49+
Alex Elder <[email protected]> <[email protected]>
50+
Alex Elder <[email protected]> <[email protected]>
4151
Alex Hung <[email protected]> <[email protected]>
4252
Alex Shi <[email protected]> <[email protected]>
4353
Alex Shi <[email protected]> <[email protected]>
@@ -98,6 +108,8 @@ Ben Widawsky <[email protected]> <[email protected]>
98108
Ben Widawsky <[email protected]> <[email protected]>
99109
Ben Widawsky <[email protected]> <[email protected]>
100110
Benjamin Poirier <[email protected]> <[email protected]>
111+
Benjamin Tissoires <[email protected]> <[email protected]>
112+
Benjamin Tissoires <[email protected]> <[email protected]>
101113
Bjorn Andersson <[email protected]> <[email protected]>
102114
Bjorn Andersson <[email protected]> <[email protected]>
103115
Bjorn Andersson <[email protected]> <[email protected]>
@@ -500,6 +512,7 @@ Praveen BP <[email protected]>
500512
Pradeep Kumar Chitrapu <[email protected]> <[email protected]>
501513
Prasad Sodagudi <[email protected]> <[email protected]>
502514
Punit Agrawal <[email protected]> <[email protected]>
515+
Puranjay Mohan <[email protected]> <[email protected]>
503516
Qais Yousef <[email protected]> <[email protected]>
504517
Qais Yousef <[email protected]> <[email protected]>
505518
Quentin Monnet <[email protected]> <[email protected]>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3423,6 +3423,9 @@
34233423
arch-independent options, each of which is an
34243424
aggregation of existing arch-specific options.
34253425

3426+
Note, "mitigations" is supported if and only if the
3427+
kernel was built with CPU_MITIGATIONS=y.
3428+
34263429
off
34273430
Disable all optional CPU mitigations. This
34283431
improves system performance, but it may also

‎Documentation/admin-guide/verify-bugs-and-bisect-regressions.rst‎

Lines changed: 417 additions & 180 deletions
Large diffs are not rendered by default.

‎Documentation/core-api/workqueue.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ configuration, worker pools and how workqueues map to the pools: ::
671671
events_unbound unbound 9 9 10 10 8
672672
events_freezable percpu 0 2 4 6
673673
events_power_efficient percpu 0 2 4 6
674-
events_freezable_power_ percpu 0 2 4 6
674+
events_freezable_pwr_ef percpu 0 2 4 6
675675
rcu_gp percpu 0 2 4 6
676676
rcu_par_gp percpu 0 2 4 6
677677
slub_flushwq percpu 0 2 4 6
@@ -694,7 +694,7 @@ Use tools/workqueue/wq_monitor.py to monitor workqueue operations: ::
694694
events_unbound 38306 0 0.1 - 7 - -
695695
events_freezable 0 0 0.0 0 0 - -
696696
events_power_efficient 29598 0 0.2 0 0 - -
697-
events_freezable_power_ 10 0 0.0 0 0 - -
697+
events_freezable_pwr_ef 10 0 0.0 0 0 - -
698698
sock_diag_events 0 0 0.0 0 0 - -
699699

700700
total infl CPUtime CPUhog CMW/RPR mayday rescued
@@ -704,7 +704,7 @@ Use tools/workqueue/wq_monitor.py to monitor workqueue operations: ::
704704
events_unbound 38322 0 0.1 - 7 - -
705705
events_freezable 0 0 0.0 0 0 - -
706706
events_power_efficient 29603 0 0.2 0 0 - -
707-
events_freezable_power_ 10 0 0.0 0 0 - -
707+
events_freezable_pwr_ef 10 0 0.0 0 0 - -
708708
sock_diag_events 0 0 0.0 0 0 - -
709709

710710
...

‎Documentation/devicetree/bindings/eeprom/at24.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,10 @@ properties:
6868
pattern: cs16$
6969
- items:
7070
pattern: c32$
71-
- items:
72-
pattern: c32d-wl$
7371
- items:
7472
pattern: cs32$
7573
- items:
7674
pattern: c64$
77-
- items:
78-
pattern: c64d-wl$
7975
- items:
8076
pattern: cs64$
8177
- items:
@@ -136,6 +132,7 @@ properties:
136132
- renesas,r1ex24128
137133
- samsung,s524ad0xd1
138134
- const: atmel,24c128
135+
- pattern: '^atmel,24c(32|64)d-wl$' # Actual vendor is st
139136

140137
label:
141138
description: Descriptive name of the EEPROM.

‎Documentation/devicetree/bindings/iio/health/maxim,max30102.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ allOf:
4646
properties:
4747
compatible:
4848
contains:
49-
const: maxim,max30100
49+
const: maxim,max30102
5050
then:
5151
properties:
5252
maxim,green-led-current-microamp: false

‎Documentation/devicetree/bindings/pinctrl/renesas,rzg2l-pinctrl.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,9 @@ additionalProperties:
120120
slew-rate: true
121121
gpio-hog: true
122122
gpios: true
123+
input: true
123124
input-enable: true
125+
output-enable: true
124126
output-high: true
125127
output-low: true
126128
line-name: true

‎Documentation/devicetree/bindings/soc/rockchip/grf.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ allOf:
171171
unevaluatedProperties: false
172172

173173
pcie-phy:
174+
type: object
174175
description:
175176
Documentation/devicetree/bindings/phy/rockchip-pcie-phy.txt
176177

‎Documentation/devicetree/bindings/sound/rt5645.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ Optional properties:
2020
a GPIO spec for the external headphone detect pin. If jd-mode = 0,
2121
we will get the JD status by getting the value of hp-detect-gpios.
2222

23+
- cbj-sleeve-gpios:
24+
a GPIO spec to control the external combo jack circuit to tie the sleeve/ring2
25+
contacts to the ground or floating. It could avoid some electric noise from the
26+
active speaker jacks.
27+
2328
- realtek,in2-differential
2429
Boolean. Indicate MIC2 input are differential, rather than single-ended.
2530

@@ -68,6 +73,7 @@ codec: rt5650@1a {
6873
compatible = "realtek,rt5650";
6974
reg = <0x1a>;
7075
hp-detect-gpios = <&gpio 19 0>;
76+
cbj-sleeve-gpios = <&gpio 20 0>;
7177
interrupt-parent = <&gpio>;
7278
interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
7379
realtek,dmic-en = "true";

‎Documentation/rust/arch-support.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ support corresponds to ``S`` values in the ``MAINTAINERS`` file.
1616
Architecture Level of support Constraints
1717
============= ================ ==============================================
1818
``arm64`` Maintained Little Endian only.
19-
``loongarch`` Maintained -
19+
``loongarch`` Maintained \-
2020
``um`` Maintained ``x86_64`` only.
2121
``x86`` Maintained ``x86_64`` only.
2222
============= ================ ==============================================

0 commit comments

Comments
 (0)