Skip to content

Commit 2f35580

Browse files
htejunhtejun
committed
Merge branch 'for-6.6-fixes' into for-next
2 parents 783a833 + 1ca0b60 commit 2f35580

File tree

880 files changed

+9205
-5172
lines changed

Some content is hidden

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

880 files changed

+9205
-5172
lines changed

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,7 @@ Matthew Wilcox <willy@infradead.org> <willy@debian.org>
377377
Matthew Wilcox <willy@infradead.org> <willy@linux.intel.com>
378378
Matthew Wilcox <willy@infradead.org> <willy@parisc-linux.org>
379379
Matthias Fuchs <socketcan@esd.eu> <matthias.fuchs@esd.eu>
380+
Matthieu Baerts <matttbe@kernel.org> <matthieu.baerts@tessares.net>
380381
Matthieu CASTET <castet.matthieu@free.fr>
381382
Matti Vaittinen <mazziesaccount@gmail.com> <matti.vaittinen@fi.rohmeurope.com>
382383
Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>

‎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/arm64/silicon-errata.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ stable kernels.
7171
+----------------+-----------------+-----------------+-----------------------------+
7272
| ARM | Cortex-A510 | #2658417 | ARM64_ERRATUM_2658417 |
7373
+----------------+-----------------+-----------------+-----------------------------+
74+
| ARM | Cortex-A520 | #2966298 | ARM64_ERRATUM_2966298 |
75+
+----------------+-----------------+-----------------+-----------------------------+
7476
| ARM | Cortex-A53 | #826319 | ARM64_ERRATUM_826319 |
7577
+----------------+-----------------+-----------------+-----------------------------+
7678
| ARM | Cortex-A53 | #827319 | ARM64_ERRATUM_827319 |

‎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/bus/fsl,imx8qxp-pixel-link-msi-bus.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ patternProperties:
7373
"^.*@[0-9a-f]+$":
7474
description: Devices attached to the bus
7575
type: object
76-
properties:
77-
reg:
78-
maxItems: 1
7976

8077
required:
8178
- reg

‎Documentation/devicetree/bindings/cache/andestech,ax45mp-cache.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ examples:
6969
- |
7070
#include <dt-bindings/interrupt-controller/irq.h>
7171
72-
cache-controller@2010000 {
72+
cache-controller@13400000 {
7373
compatible = "andestech,ax45mp-cache", "cache";
7474
reg = <0x13400000 0x100000>;
7575
interrupts = <508 IRQ_TYPE_LEVEL_HIGH>;

‎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
};

0 commit comments

Comments
 (0)