Skip to content

Commit 3fc18b0

Browse files
author
Ingo Molnar
committed
Merge tag 'v6.6-rc4' into x86/entry, to pick up fixes
Signed-off-by: Ingo Molnar <[email protected]>
2 parents a11e097 + 8a749fd commit 3fc18b0

File tree

949 files changed

+8532
-5071
lines changed

Some content is hidden

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

949 files changed

+8532
-5071
lines changed

Documentation/admin-guide/cgroup-v1/memory.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,13 @@ Brief summary of control files.
9292
memory.oom_control set/show oom controls.
9393
memory.numa_stat show the number of memory usage per numa
9494
node
95+
memory.kmem.limit_in_bytes Deprecated knob to set and read the kernel
96+
memory hard limit. Kernel hard limit is not
97+
supported since 5.16. Writing any value to
98+
do file will not have any effect same as if
99+
nokmem kernel parameter was specified.
100+
Kernel memory is still charged and reported
101+
by memory.kmem.usage_in_bytes.
95102
memory.kmem.usage_in_bytes show current kernel memory allocation
96103
memory.kmem.failcnt show the number of kernel memory usage
97104
hits limits

Documentation/arch/arm64/cpu-feature-registers.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ infrastructure:
175175
+------------------------------+---------+---------+
176176
| Name | bits | visible |
177177
+------------------------------+---------+---------+
178+
| SME | [27-24] | y |
179+
+------------------------------+---------+---------+
178180
| MTE | [11-8] | y |
179181
+------------------------------+---------+---------+
180182
| SSBS | [7-4] | y |
@@ -288,8 +290,18 @@ infrastructure:
288290
+------------------------------+---------+---------+
289291
| Name | bits | visible |
290292
+------------------------------+---------+---------+
293+
| CSSC | [55-52] | y |
294+
+------------------------------+---------+---------+
295+
| RPRFM | [51-48] | y |
296+
+------------------------------+---------+---------+
297+
| BC | [23-20] | y |
298+
+------------------------------+---------+---------+
291299
| MOPS | [19-16] | y |
292300
+------------------------------+---------+---------+
301+
| APA3 | [15-12] | y |
302+
+------------------------------+---------+---------+
303+
| GPA3 | [11-8] | y |
304+
+------------------------------+---------+---------+
293305
| RPRES | [7-4] | y |
294306
+------------------------------+---------+---------+
295307
| WFXT | [3-0] | y |

Documentation/arch/arm64/elf_hwcaps.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,9 @@ HWCAP2_SMEF16F16
305305
HWCAP2_MOPS
306306
Functionality implied by ID_AA64ISAR2_EL1.MOPS == 0b0001.
307307

308+
HWCAP2_HBC
309+
Functionality implied by ID_AA64ISAR2_EL1.BC == 0b0001.
310+
308311
4. Unused AT_HWCAP bits
309312
-----------------------
310313

Documentation/arch/loongarch/introduction.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,9 +381,9 @@ Documentation of LoongArch ISA:
381381

382382
Documentation of LoongArch ELF psABI:
383383

384-
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.00-CN.pdf (in Chinese)
384+
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.01-CN.pdf (in Chinese)
385385

386-
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.00-EN.pdf (in English)
386+
https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.01-EN.pdf (in English)
387387

388388
Linux kernel repository of Loongson and LoongArch:
389389

Documentation/devicetree/bindings/ata/pata-common.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ patternProperties:
3838
ID number 0 and the slave drive will have ID number 1. The PATA port
3939
nodes will be named "ide-port".
4040
type: object
41+
additionalProperties: false
4142

4243
properties:
4344
reg:

Documentation/devicetree/bindings/clock/renesas,5p35023.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ properties:
3737
maxItems: 1
3838

3939
'#clock-cells':
40+
description:
41+
The index in the assigned-clocks is mapped to the output clock as below
42+
0 - REF, 1 - SE1, 2 - SE2, 3 - SE3, 4 - DIFF1, 5 - DIFF2.
4043
const: 1
4144

4245
clocks:
@@ -68,7 +71,7 @@ examples:
6871
reg = <0x68>;
6972
#clock-cells = <1>;
7073
71-
clocks = <&x1_x2>;
74+
clocks = <&x1>;
7275
7376
renesas,settings = [
7477
80 00 11 19 4c 02 23 7f 83 19 08 a9 5f 25 24 bf
@@ -79,8 +82,8 @@ examples:
7982
assigned-clocks = <&versa3 0>, <&versa3 1>,
8083
<&versa3 2>, <&versa3 3>,
8184
<&versa3 4>, <&versa3 5>;
82-
assigned-clock-rates = <12288000>, <25000000>,
83-
<12000000>, <11289600>,
84-
<11289600>, <24000000>;
85+
assigned-clock-rates = <24000000>, <11289600>,
86+
<11289600>, <12000000>,
87+
<25000000>, <12288000>;
8588
};
8689
};

Documentation/devicetree/bindings/i2c/i2c-mxs.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ title: Freescale MXS Inter IC (I2C) Controller
99
maintainers:
1010
- Shawn Guo <[email protected]>
1111

12+
allOf:
13+
- $ref: /schemas/i2c/i2c-controller.yaml#
14+
1215
properties:
1316
compatible:
1417
enum:
@@ -37,7 +40,7 @@ required:
3740
- dmas
3841
- dma-names
3942

40-
additionalProperties: false
43+
unevaluatedProperties: false
4144

4245
examples:
4346
- |

Documentation/devicetree/bindings/soc/loongson/loongson,ls2k-pmc.yaml

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,16 @@ maintainers:
1111

1212
properties:
1313
compatible:
14-
items:
15-
- enum:
16-
- loongson,ls2k0500-pmc
17-
- loongson,ls2k1000-pmc
18-
- const: syscon
14+
oneOf:
15+
- items:
16+
- const: loongson,ls2k0500-pmc
17+
- const: syscon
18+
- items:
19+
- enum:
20+
- loongson,ls2k1000-pmc
21+
- loongson,ls2k2000-pmc
22+
- const: loongson,ls2k0500-pmc
23+
- const: syscon
1924

2025
reg:
2126
maxItems: 1
@@ -32,6 +37,18 @@ properties:
3237
addition, the PM need according to it to indicate that current
3338
SoC whether support Suspend To RAM.
3439

40+
syscon-poweroff:
41+
$ref: /schemas/power/reset/syscon-poweroff.yaml#
42+
type: object
43+
description:
44+
Node for power off method
45+
46+
syscon-reboot:
47+
$ref: /schemas/power/reset/syscon-reboot.yaml#
48+
type: object
49+
description:
50+
Node for reboot method
51+
3552
required:
3653
- compatible
3754
- reg
@@ -44,9 +61,23 @@ examples:
4461
#include <dt-bindings/interrupt-controller/irq.h>
4562
4663
power-management@1fe27000 {
47-
compatible = "loongson,ls2k1000-pmc", "syscon";
64+
compatible = "loongson,ls2k1000-pmc", "loongson,ls2k0500-pmc", "syscon";
4865
reg = <0x1fe27000 0x58>;
4966
interrupt-parent = <&liointc1>;
5067
interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
5168
loongson,suspend-address = <0x0 0x1c000500>;
69+
70+
syscon-reboot {
71+
compatible = "syscon-reboot";
72+
offset = <0x30>;
73+
mask = <0x1>;
74+
};
75+
76+
syscon-poweroff {
77+
compatible = "syscon-poweroff";
78+
regmap = <&pmc>;
79+
offset = <0x14>;
80+
mask = <0x3c00>;
81+
value = <0x3c00>;
82+
};
5283
};

Documentation/devicetree/bindings/spi/fsl-imx-cspi.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ properties:
2222
- const: fsl,imx35-cspi
2323
- const: fsl,imx51-ecspi
2424
- const: fsl,imx53-ecspi
25+
- items:
26+
- enum:
27+
- fsl,imx25-cspi
28+
- fsl,imx50-cspi
29+
- fsl,imx51-cspi
30+
- fsl,imx53-cspi
31+
- const: fsl,imx35-cspi
2532
- items:
2633
- const: fsl,imx8mp-ecspi
2734
- const: fsl,imx6ul-ecspi

Documentation/filesystems/btrfs.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ For more information please refer to the documentation site or wiki
3737

3838
https://btrfs.readthedocs.io
3939

40-
https://btrfs.wiki.kernel.org
4140

4241
that maintains information about administration tasks, frequently asked
4342
questions, use cases, mount options, comprehensible changelogs, features,

0 commit comments

Comments
 (0)