Skip to content

Commit ec665ef

Browse files
committed
Merge remote-tracking branch 'stable/linux-6.12.y' into v6.12+
2 parents 5ae30a9 + 47edb26 commit ec665ef

897 files changed

Lines changed: 13145 additions & 6532 deletions

File tree

Some content is hidden

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

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/admin-guide/blockdev/zram.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ The list of possible return codes:
4747
-ENOMEM zram was not able to allocate enough memory to fulfil your
4848
needs.
4949
-EINVAL invalid input has been provided.
50+
-EAGAIN re-try operation later (e.g. when attempting to run recompress
51+
and writeback simultaneously).
5052
======== =============================================================
5153

5254
If you use 'echo', the returned value is set by the 'echo' utility,

Documentation/admin-guide/media/building.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Please notice, however, that, if:
1515

1616
you should use the main media development tree ``master`` branch:
1717

18-
https://git.linuxtv.org/media_tree.git/
18+
https://git.linuxtv.org/media.git/
1919

2020
In this case, you may find some useful information at the
2121
`LinuxTv wiki pages <https://linuxtv.org/wiki>`_:

Documentation/admin-guide/media/saa7134.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Changes / Fixes
6767
Please mail to linux-media AT vger.kernel.org unified diffs against
6868
the linux media git tree:
6969

70-
https://git.linuxtv.org/media_tree.git/
70+
https://git.linuxtv.org/media.git/
7171

7272
This is done by committing a patch at a clone of the git tree and
7373
submitting the patch using ``git send-email``. Don't forget to

Documentation/arch/x86/boot.rst

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -896,10 +896,19 @@ Offset/size: 0x260/4
896896

897897
The kernel runtime start address is determined by the following algorithm::
898898

899-
if (relocatable_kernel)
900-
runtime_start = align_up(load_address, kernel_alignment)
901-
else
902-
runtime_start = pref_address
899+
if (relocatable_kernel) {
900+
if (load_address < pref_address)
901+
load_address = pref_address;
902+
runtime_start = align_up(load_address, kernel_alignment);
903+
} else {
904+
runtime_start = pref_address;
905+
}
906+
907+
Hence the necessary memory window location and size can be estimated by
908+
a boot loader as::
909+
910+
memory_window_start = runtime_start;
911+
memory_window_size = init_size;
903912

904913
============ ===============
905914
Field name: handover_offset

Documentation/devicetree/bindings/cache/qcom,llcc.yaml

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ properties:
3939

4040
reg:
4141
minItems: 2
42-
maxItems: 9
42+
maxItems: 10
4343

4444
reg-names:
4545
minItems: 2
46-
maxItems: 9
46+
maxItems: 10
4747

4848
interrupts:
4949
maxItems: 1
@@ -134,6 +134,36 @@ allOf:
134134
- qcom,qdu1000-llcc
135135
- qcom,sc8180x-llcc
136136
- qcom,sc8280xp-llcc
137+
then:
138+
properties:
139+
reg:
140+
items:
141+
- description: LLCC0 base register region
142+
- description: LLCC1 base register region
143+
- description: LLCC2 base register region
144+
- description: LLCC3 base register region
145+
- description: LLCC4 base register region
146+
- description: LLCC5 base register region
147+
- description: LLCC6 base register region
148+
- description: LLCC7 base register region
149+
- description: LLCC broadcast base register region
150+
reg-names:
151+
items:
152+
- const: llcc0_base
153+
- const: llcc1_base
154+
- const: llcc2_base
155+
- const: llcc3_base
156+
- const: llcc4_base
157+
- const: llcc5_base
158+
- const: llcc6_base
159+
- const: llcc7_base
160+
- const: llcc_broadcast_base
161+
162+
- if:
163+
properties:
164+
compatible:
165+
contains:
166+
enum:
137167
- qcom,x1e80100-llcc
138168
then:
139169
properties:
@@ -148,6 +178,7 @@ allOf:
148178
- description: LLCC6 base register region
149179
- description: LLCC7 base register region
150180
- description: LLCC broadcast base register region
181+
- description: LLCC broadcast AND register region
151182
reg-names:
152183
items:
153184
- const: llcc0_base
@@ -159,6 +190,7 @@ allOf:
159190
- const: llcc6_base
160191
- const: llcc7_base
161192
- const: llcc_broadcast_base
193+
- const: llcc_broadcast_and_base
162194

163195
- if:
164196
properties:

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
@@ -30,7 +30,7 @@ properties:
3030
maxItems: 1
3131

3232
spi-max-frequency:
33-
maximum: 30000000
33+
maximum: 66000000
3434

3535
reset-gpios:
3636
maxItems: 1

Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ allOf:
149149
then:
150150
properties:
151151
clocks:
152-
minItems: 4
152+
minItems: 6
153153

154154
clock-names:
155155
items:
@@ -178,7 +178,7 @@ allOf:
178178
then:
179179
properties:
180180
clocks:
181-
minItems: 4
181+
minItems: 6
182182

183183
clock-names:
184184
items:
@@ -207,6 +207,7 @@ allOf:
207207
properties:
208208
clocks:
209209
minItems: 4
210+
maxItems: 4
210211

211212
clock-names:
212213
items:

0 commit comments

Comments
 (0)