Skip to content

Commit

Permalink
BackMerge tag 'v6.6-rc7' into drm-next
Browse files Browse the repository at this point in the history 
This is needed to add the msm pr which is based on a higher base.

Signed-off-by: Dave Airlie <[email protected]>
  • Loading branch information
@airlied
airlied committed Oct 23, 2023
2 parents 035fdc3 + 05d3ef8 commit 7cd62ea
Show file tree
Hide file tree
Showing 1,377 changed files with 14,797 additions and 7,670 deletions.
1 change: 1 addition & 0 deletions .mailmap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ Matthew Wilcox <[email protected]> <[email protected]>
Matthew Wilcox <[email protected]> <[email protected]>
Matthew Wilcox <[email protected]> <[email protected]>
Matthias Fuchs <[email protected]> <[email protected]>
Matthieu Baerts <[email protected]> <[email protected]>
Matthieu CASTET <[email protected]>
Matti Vaittinen <[email protected]> <[email protected]>
Matt Ranostay <[email protected]> <[email protected]>
Expand Down
14 changes: 7 additions & 7 deletions Documentation/ABI/testing/sysfs-class-firmware
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
What: /sys/class/firmware/.../data
Date: July 2022
KernelVersion: 5.19
Contact: Russ Weight <russell.h.weight@intel.com>
Contact: Russ Weight <russ.weight@linux.dev>
Description: The data sysfs file is used for firmware-fallback and for
firmware uploads. Cat a firmware image to this sysfs file
after you echo 1 to the loading sysfs file. When the firmware
Expand All @@ -13,7 +13,7 @@ Description: The data sysfs file is used for firmware-fallback and for
What: /sys/class/firmware/.../cancel
Date: July 2022
KernelVersion: 5.19
Contact: Russ Weight <russell.h.weight@intel.com>
Contact: Russ Weight <russ.weight@linux.dev>
Description: Write-only. For firmware uploads, write a "1" to this file to
request that the transfer of firmware data to the lower-level
device be canceled. This request will be rejected (EBUSY) if
Expand All @@ -23,7 +23,7 @@ Description: Write-only. For firmware uploads, write a "1" to this file to
What: /sys/class/firmware/.../error
Date: July 2022
KernelVersion: 5.19
Contact: Russ Weight <russell.h.weight@intel.com>
Contact: Russ Weight <russ.weight@linux.dev>
Description: Read-only. Returns a string describing a failed firmware
upload. This string will be in the form of <STATUS>:<ERROR>,
where <STATUS> will be one of the status strings described
Expand All @@ -37,7 +37,7 @@ Description: Read-only. Returns a string describing a failed firmware
What: /sys/class/firmware/.../loading
Date: July 2022
KernelVersion: 5.19
Contact: Russ Weight <russell.h.weight@intel.com>
Contact: Russ Weight <russ.weight@linux.dev>
Description: The loading sysfs file is used for both firmware-fallback and
for firmware uploads. Echo 1 onto the loading file to indicate
you are writing a firmware file to the data sysfs node. Echo
Expand All @@ -49,7 +49,7 @@ Description: The loading sysfs file is used for both firmware-fallback and
What: /sys/class/firmware/.../remaining_size
Date: July 2022
KernelVersion: 5.19
Contact: Russ Weight <russell.h.weight@intel.com>
Contact: Russ Weight <russ.weight@linux.dev>
Description: Read-only. For firmware upload, this file contains the size
of the firmware data that remains to be transferred to the
lower-level device driver. The size value is initialized to
Expand All @@ -62,15 +62,15 @@ Description: Read-only. For firmware upload, this file contains the size
What: /sys/class/firmware/.../status
Date: July 2022
KernelVersion: 5.19
Contact: Russ Weight <russell.h.weight@intel.com>
Contact: Russ Weight <russ.weight@linux.dev>
Description: Read-only. Returns a string describing the current status of
a firmware upload. The string will be one of the following:
idle, "receiving", "preparing", "transferring", "programming".

What: /sys/class/firmware/.../timeout
Date: July 2022
KernelVersion: 5.19
Contact: Russ Weight <russell.h.weight@intel.com>
Contact: Russ Weight <russ.weight@linux.dev>
Description: This file supports the timeout mechanism for firmware
fallback. This file has no affect on firmware uploads. For
more information on timeouts please see the documentation
Expand Down
7 changes: 7 additions & 0 deletions Documentation/admin-guide/cgroup-v1/memory.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,13 @@ Brief summary of control files.
memory.oom_control set/show oom controls.
memory.numa_stat show the number of memory usage per numa
node
memory.kmem.limit_in_bytes Deprecated knob to set and read the kernel
memory hard limit. Kernel hard limit is not
supported since 5.16. Writing any value to
do file will not have any effect same as if
nokmem kernel parameter was specified.
Kernel memory is still charged and reported
by memory.kmem.usage_in_bytes.
memory.kmem.usage_in_bytes show current kernel memory allocation
memory.kmem.failcnt show the number of kernel memory usage
hits limits
Expand Down
12 changes: 12 additions & 0 deletions Documentation/arch/arm64/cpu-feature-registers.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@ infrastructure:
+------------------------------+---------+---------+
| Name | bits | visible |
+------------------------------+---------+---------+
| SME | [27-24] | y |
+------------------------------+---------+---------+
| MTE | [11-8] | y |
+------------------------------+---------+---------+
| SSBS | [7-4] | y |
Expand Down Expand Up @@ -288,8 +290,18 @@ infrastructure:
+------------------------------+---------+---------+
| Name | bits | visible |
+------------------------------+---------+---------+
| CSSC | [55-52] | y |
+------------------------------+---------+---------+
| RPRFM | [51-48] | y |
+------------------------------+---------+---------+
| BC | [23-20] | y |
+------------------------------+---------+---------+
| MOPS | [19-16] | y |
+------------------------------+---------+---------+
| APA3 | [15-12] | y |
+------------------------------+---------+---------+
| GPA3 | [11-8] | y |
+------------------------------+---------+---------+
| RPRES | [7-4] | y |
+------------------------------+---------+---------+
| WFXT | [3-0] | y |
Expand Down
3 changes: 3 additions & 0 deletions Documentation/arch/arm64/elf_hwcaps.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,9 @@ HWCAP2_SMEF16F16
HWCAP2_MOPS
Functionality implied by ID_AA64ISAR2_EL1.MOPS == 0b0001.

HWCAP2_HBC
Functionality implied by ID_AA64ISAR2_EL1.BC == 0b0001.

4. Unused AT_HWCAP bits
-----------------------

Expand Down
2 changes: 2 additions & 0 deletions Documentation/arch/arm64/silicon-errata.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ stable kernels.
+----------------+-----------------+-----------------+-----------------------------+
| ARM | Cortex-A510 | #2658417 | ARM64_ERRATUM_2658417 |
+----------------+-----------------+-----------------+-----------------------------+
| ARM | Cortex-A520 | #2966298 | ARM64_ERRATUM_2966298 |
+----------------+-----------------+-----------------+-----------------------------+
| ARM | Cortex-A53 | #826319 | ARM64_ERRATUM_826319 |
+----------------+-----------------+-----------------+-----------------------------+
| ARM | Cortex-A53 | #827319 | ARM64_ERRATUM_827319 |
Expand Down
4 changes: 2 additions & 2 deletions Documentation/arch/loongarch/introduction.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,9 +381,9 @@ Documentation of LoongArch ISA:

Documentation of LoongArch ELF psABI:

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

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

Linux kernel repository of Loongson and LoongArch:

Expand Down
4 changes: 2 additions & 2 deletions Documentation/core-api/workqueue.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ unbound worker-pools and only one work item could be active at any given
time thus achieving the same ordering property as ST wq.

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


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

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

``affinity_scope``
Expand Down
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/ata/pata-common.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ patternProperties:
ID number 0 and the slave drive will have ID number 1. The PATA port
nodes will be named "ide-port".
type: object
additionalProperties: false

properties:
reg:
Expand Down
3 changes: 0 additions & 3 deletions Documentation/devicetree/bindings/bus/fsl,imx8qxp-pixel-link-msi-bus.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ patternProperties:
"^.*@[0-9a-f]+$":
description: Devices attached to the bus
type: object
properties:
reg:
maxItems: 1

required:
- reg
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/cache/andestech,ax45mp-cache.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ examples:
- |
#include <dt-bindings/interrupt-controller/irq.h>
cache-controller@2010000 {
cache-controller@13400000 {
compatible = "andestech,ax45mp-cache", "cache";
reg = <0x13400000 0x100000>;
interrupts = <508 IRQ_TYPE_LEVEL_HIGH>;
Expand Down
11 changes: 7 additions & 4 deletions Documentation/devicetree/bindings/clock/renesas,5p35023.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ properties:
maxItems: 1

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

clocks:
Expand Down Expand Up @@ -68,7 +71,7 @@ examples:
reg = <0x68>;
#clock-cells = <1>;
clocks = <&x1_x2>;
clocks = <&x1>;
renesas,settings = [
80 00 11 19 4c 02 23 7f 83 19 08 a9 5f 25 24 bf
Expand All @@ -79,8 +82,8 @@ examples:
assigned-clocks = <&versa3 0>, <&versa3 1>,
<&versa3 2>, <&versa3 3>,
<&versa3 4>, <&versa3 5>;
assigned-clock-rates = <12288000>, <25000000>,
<12000000>, <11289600>,
<11289600>, <24000000>;
assigned-clock-rates = <24000000>, <11289600>,
<11289600>, <12000000>,
<25000000>, <12288000>;
};
};
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/display/imx/fsl,imx6-hdmi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ required:
- interrupts
- ports

additionalProperties: false
unevaluatedProperties: false

examples:
- |
Expand Down
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ description: |
maintainers:
- Michael Tretter <[email protected]>
- Harini Katakam <[email protected]>
- Radhey Shyam Pandey <[email protected]>

allOf:
- $ref: ../dma-controller.yaml#
Expand Down Expand Up @@ -65,6 +67,7 @@ required:
- interrupts
- clocks
- clock-names
- xlnx,bus-width

additionalProperties: false

Expand Down
5 changes: 4 additions & 1 deletion Documentation/devicetree/bindings/i2c/i2c-mxs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ title: Freescale MXS Inter IC (I2C) Controller
maintainers:
- Shawn Guo <[email protected]>

allOf:
- $ref: /schemas/i2c/i2c-controller.yaml#

properties:
compatible:
enum:
Expand Down Expand Up @@ -37,7 +40,7 @@ required:
- dmas
- dma-names

additionalProperties: false
unevaluatedProperties: false

examples:
- |
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/iio/adc/adi,ad7292.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ patternProperties:
required:
- reg

additionalProperties: true
additionalProperties: false

allOf:
- $ref: /schemas/spi/spi-peripheral-props.yaml#
Expand Down
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/iio/light/rohm,bu27010.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@ examples:
light-sensor@38 {
compatible = "rohm,bu27010";
reg = <0x38>;
vdd-supply = <&vdd>;
};
};
12 changes: 12 additions & 0 deletions Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,12 @@ properties:
$ref: /schemas/types.yaml#/definitions/uint32
maximum: 4096

dma-noncoherent:
description:
Present if the GIC redistributors permit programming shareability
and cacheability attributes but are connected to a non-coherent
downstream interconnect.

msi-controller:
description:
Only present if the Message Based Interrupt functionality is
Expand Down Expand Up @@ -193,6 +199,12 @@ patternProperties:
compatible:
const: arm,gic-v3-its

dma-noncoherent:
description:
Present if the GIC ITS permits programming shareability and
cacheability attributes but is connected to a non-coherent
downstream interconnect.

msi-controller: true

"#msi-cells":
Expand Down
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ properties:
- renesas,intc-ex-r8a77990 # R-Car E3
- renesas,intc-ex-r8a77995 # R-Car D3
- renesas,intc-ex-r8a779a0 # R-Car V3U
- renesas,intc-ex-r8a779f0 # R-Car S4-8
- renesas,intc-ex-r8a779g0 # R-Car V4H
- const: renesas,irqc

Expand Down
Loading

0 comments on commit 7cd62ea

Please sign in to comment.