Skip to content

Commit a7ff1c0

Browse files
committed
Merge remote-tracking branch 'stable/linux-6.6.y' into rpi-6.6.y
2 parents 4636f17 + 22a054e commit a7ff1c0

File tree

765 files changed

+7239
-3495
lines changed

Some content is hidden

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

765 files changed

+7239
-3495
lines changed

Documentation/ABI/testing/sysfs-fs-f2fs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,10 +311,13 @@ Description: Do background GC aggressively when set. Set to 0 by default.
311311
GC approach and turns SSR mode on.
312312
gc urgent low(2): lowers the bar of checking I/O idling in
313313
order to process outstanding discard commands and GC a
314-
little bit aggressively. uses cost benefit GC approach.
314+
little bit aggressively. always uses cost benefit GC approach,
315+
and will override age-threshold GC approach if ATGC is enabled
316+
at the same time.
315317
gc urgent mid(3): does GC forcibly in a period of given
316318
gc_urgent_sleep_time and executes a mid level of I/O idling check.
317-
uses cost benefit GC approach.
319+
always uses cost benefit GC approach, and will override
320+
age-threshold GC approach if ATGC is enabled at the same time.
318321

319322
What: /sys/fs/f2fs/<disk>/gc_urgent_sleep_time
320323
Date: August 2017

Documentation/RCU/stallwarn.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ ticks this GP)" indicates that this CPU has not taken any scheduling-clock
249249
interrupts during the current stalled grace period.
250250

251251
The "idle=" portion of the message prints the dyntick-idle state.
252-
The hex number before the first "/" is the low-order 12 bits of the
252+
The hex number before the first "/" is the low-order 16 bits of the
253253
dynticks counter, which will have an even-numbered value if the CPU
254254
is in dyntick-idle mode and an odd-numbered value otherwise. The hex
255255
number between the two "/"s is the value of the nesting, which will be

Documentation/devicetree/bindings/clock/adi,axi-clkgen.yaml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,21 @@ properties:
2626
description:
2727
Specifies the reference clock(s) from which the output frequency is
2828
derived. This must either reference one clock if only the first clock
29-
input is connected or two if both clock inputs are connected.
30-
minItems: 1
31-
maxItems: 2
29+
input is connected or two if both clock inputs are connected. The last
30+
clock is the AXI bus clock that needs to be enabled so we can access the
31+
core registers.
32+
minItems: 2
33+
maxItems: 3
34+
35+
clock-names:
36+
oneOf:
37+
- items:
38+
- const: clkin1
39+
- const: s_axi_aclk
40+
- items:
41+
- const: clkin1
42+
- const: clkin2
43+
- const: s_axi_aclk
3244

3345
'#clock-cells':
3446
const: 0
@@ -40,6 +52,7 @@ required:
4052
- compatible
4153
- reg
4254
- clocks
55+
- clock-names
4356
- '#clock-cells'
4457

4558
additionalProperties: false
@@ -50,5 +63,6 @@ examples:
5063
compatible = "adi,axi-clkgen-2.00.a";
5164
#clock-cells = <0>;
5265
reg = <0xff000000 0x1000>;
53-
clocks = <&osc 1>;
66+
clocks = <&osc 1>, <&clkc 15>;
67+
clock-names = "clkin1", "s_axi_aclk";
5468
};

Documentation/devicetree/bindings/iio/dac/adi,ad3552r.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ properties:
2626
maxItems: 1
2727

2828
spi-max-frequency:
29-
maximum: 30000000
29+
maximum: 66000000
3030

3131
reset-gpios:
3232
maxItems: 1

Documentation/devicetree/bindings/serial/rs485.yaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,15 @@ properties:
1818
description: prop-encoded-array <a b>
1919
$ref: /schemas/types.yaml#/definitions/uint32-array
2020
items:
21-
items:
22-
- description: Delay between rts signal and beginning of data sent in
23-
milliseconds. It corresponds to the delay before sending data.
24-
default: 0
25-
maximum: 100
26-
- description: Delay between end of data sent and rts signal in milliseconds.
27-
It corresponds to the delay after sending data and actual release
28-
of the line.
29-
default: 0
30-
maximum: 100
21+
- description: Delay between rts signal and beginning of data sent in
22+
milliseconds. It corresponds to the delay before sending data.
23+
default: 0
24+
maximum: 100
25+
- description: Delay between end of data sent and rts signal in milliseconds.
26+
It corresponds to the delay after sending data and actual release
27+
of the line.
28+
default: 0
29+
maximum: 100
3130

3231
rs485-rts-active-high:
3332
description: drive RTS high when sending (this is the default).

Documentation/devicetree/bindings/sound/mt6359.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ properties:
2323
Indicates how many data pins are used to transmit two channels of PDM
2424
signal. 0 means two wires, 1 means one wire. Default value is 0.
2525
enum:
26-
- 0 # one wire
27-
- 1 # two wires
26+
- 0 # two wires
27+
- 1 # one wire
2828

2929
mediatek,mic-type-0:
3030
$ref: /schemas/types.yaml#/definitions/uint32
@@ -53,9 +53,9 @@ additionalProperties: false
5353

5454
examples:
5555
- |
56-
mt6359codec: mt6359codec {
57-
mediatek,dmic-mode = <0>;
58-
mediatek,mic-type-0 = <2>;
56+
mt6359codec: audio-codec {
57+
mediatek,dmic-mode = <0>;
58+
mediatek,mic-type-0 = <2>;
5959
};
6060
6161
...

Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -929,6 +929,8 @@ patternProperties:
929929
description: National Semiconductor
930930
"^nec,.*":
931931
description: NEC LCD Technologies, Ltd.
932+
"^neofidelity,.*":
933+
description: Neofidelity Inc.
932934
"^neonode,.*":
933935
description: Neonode Inc.
934936
"^netgear,.*":

Documentation/filesystems/mount_api.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,8 @@ process the parameters it is given.
766766

767767
* ::
768768

769-
bool fs_validate_description(const struct fs_parameter_description *desc);
769+
bool fs_validate_description(const char *name,
770+
const struct fs_parameter_description *desc);
770771

771772
This performs some validation checks on a parameter description. It
772773
returns true if the description is good and false if it is not. It will

Documentation/locking/seqlock.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Use seqcount_latch_t when the write side sections cannot be protected
153153
from interruption by readers. This is typically the case when the read
154154
side can be invoked from NMI handlers.
155155

156-
Check `raw_write_seqcount_latch()` for more information.
156+
Check `write_seqcount_latch()` for more information.
157157

158158

159159
.. _seqlock_t:

Documentation/networking/j1939.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ format, the Group Extension is set in the PS-field.
121121

122122
On the other hand, when using PDU1 format, the PS-field contains a so-called
123123
Destination Address, which is _not_ part of the PGN. When communicating a PGN
124-
from user space to kernel (or vice versa) and PDU2 format is used, the PS-field
124+
from user space to kernel (or vice versa) and PDU1 format is used, the PS-field
125125
of the PGN shall be set to zero. The Destination Address shall be set
126126
elsewhere.
127127

0 commit comments

Comments
 (0)