Skip to content

Commit 7cd62ea

Browse files
airliedairlied
committed
BackMerge tag 'v6.6-rc7' into drm-next
This is needed to add the msm pr which is based on a higher base. Signed-off-by: Dave Airlie <airlied@redhat.com>
2 parents 035fdc3 + 05d3ef8 commit 7cd62ea

File tree

1,377 files changed

+14797
-7670
lines changed

Some content is hidden

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

1,377 files changed

+14797
-7670
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/ABI/testing/sysfs-class-firmware

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/class/firmware/.../data
22
Date: July 2022
33
KernelVersion: 5.19
4-
Contact: Russ Weight <russell.h.weight@intel.com>
4+
Contact: Russ Weight <russ.weight@linux.dev>
55
Description: The data sysfs file is used for firmware-fallback and for
66
firmware uploads. Cat a firmware image to this sysfs file
77
after you echo 1 to the loading sysfs file. When the firmware
@@ -13,7 +13,7 @@ Description: The data sysfs file is used for firmware-fallback and for
1313
What: /sys/class/firmware/.../cancel
1414
Date: July 2022
1515
KernelVersion: 5.19
16-
Contact: Russ Weight <russell.h.weight@intel.com>
16+
Contact: Russ Weight <russ.weight@linux.dev>
1717
Description: Write-only. For firmware uploads, write a "1" to this file to
1818
request that the transfer of firmware data to the lower-level
1919
device be canceled. This request will be rejected (EBUSY) if
@@ -23,7 +23,7 @@ Description: Write-only. For firmware uploads, write a "1" to this file to
2323
What: /sys/class/firmware/.../error
2424
Date: July 2022
2525
KernelVersion: 5.19
26-
Contact: Russ Weight <russell.h.weight@intel.com>
26+
Contact: Russ Weight <russ.weight@linux.dev>
2727
Description: Read-only. Returns a string describing a failed firmware
2828
upload. This string will be in the form of <STATUS>:<ERROR>,
2929
where <STATUS> will be one of the status strings described
@@ -37,7 +37,7 @@ Description: Read-only. Returns a string describing a failed firmware
3737
What: /sys/class/firmware/.../loading
3838
Date: July 2022
3939
KernelVersion: 5.19
40-
Contact: Russ Weight <russell.h.weight@intel.com>
40+
Contact: Russ Weight <russ.weight@linux.dev>
4141
Description: The loading sysfs file is used for both firmware-fallback and
4242
for firmware uploads. Echo 1 onto the loading file to indicate
4343
you are writing a firmware file to the data sysfs node. Echo
@@ -49,7 +49,7 @@ Description: The loading sysfs file is used for both firmware-fallback and
4949
What: /sys/class/firmware/.../remaining_size
5050
Date: July 2022
5151
KernelVersion: 5.19
52-
Contact: Russ Weight <russell.h.weight@intel.com>
52+
Contact: Russ Weight <russ.weight@linux.dev>
5353
Description: Read-only. For firmware upload, this file contains the size
5454
of the firmware data that remains to be transferred to the
5555
lower-level device driver. The size value is initialized to
@@ -62,15 +62,15 @@ Description: Read-only. For firmware upload, this file contains the size
6262
What: /sys/class/firmware/.../status
6363
Date: July 2022
6464
KernelVersion: 5.19
65-
Contact: Russ Weight <russell.h.weight@intel.com>
65+
Contact: Russ Weight <russ.weight@linux.dev>
6666
Description: Read-only. Returns a string describing the current status of
6767
a firmware upload. The string will be one of the following:
6868
idle, "receiving", "preparing", "transferring", "programming".
6969

7070
What: /sys/class/firmware/.../timeout
7171
Date: July 2022
7272
KernelVersion: 5.19
73-
Contact: Russ Weight <russell.h.weight@intel.com>
73+
Contact: Russ Weight <russ.weight@linux.dev>
7474
Description: This file supports the timeout mechanism for firmware
7575
fallback. This file has no affect on firmware uploads. For
7676
more information on timeouts please see the documentation

‎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/core-api/workqueue.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ unbound worker-pools and only one work item could be active at any given
244244
time thus achieving the same ordering property as ST wq.
245245

246246
In the current implementation the above configuration only guarantees
247-
ST behavior within a given NUMA node. Instead ``alloc_ordered_queue()`` should
247+
ST behavior within a given NUMA node. Instead ``alloc_ordered_workqueue()`` should
248248
be used to achieve system-wide ST behavior.
249249

250250

@@ -390,7 +390,7 @@ The default affinity scope can be changed with the module parameter
390390
scope can be changed using ``apply_workqueue_attrs()``.
391391

392392
If ``WQ_SYSFS`` is set, the workqueue will have the following affinity scope
393-
related interface files under its ``/sys/devices/virtual/WQ_NAME/``
393+
related interface files under its ``/sys/devices/virtual/workqueue/WQ_NAME/``
394394
directory.
395395

396396
``affinity_scope``

‎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

0 commit comments

Comments
 (0)