Skip to content

Commit 5f19ca4

Browse files
gregkhgregkh
committed
Merge 6.6-rc6 into char-misc-next
We need the char/misc fixes in here as well, to build on for other changes. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2 parents d712d20 + 5872080 commit 5f19ca4

File tree

556 files changed

+6221
-2864
lines changed

Some content is hidden

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

556 files changed

+6221
-2864
lines changed

‎.mailmap

+1
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

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

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

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

-3
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

+1-1
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/display/imx/fsl,imx6-hdmi.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ required:
8787
- interrupts
8888
- ports
8989

90-
additionalProperties: false
90+
unevaluatedProperties: false
9191

9292
examples:
9393
- |

‎Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ description: |
1313
1414
maintainers:
1515
- Michael Tretter <m.tretter@pengutronix.de>
16+
- Harini Katakam <harini.katakam@amd.com>
17+
- Radhey Shyam Pandey <radhey.shyam.pandey@amd.com>
1618

1719
allOf:
1820
- $ref: ../dma-controller.yaml#
@@ -65,6 +67,7 @@ required:
6567
- interrupts
6668
- clocks
6769
- clock-names
70+
- xlnx,bus-width
6871

6972
additionalProperties: false
7073

‎Documentation/devicetree/bindings/iio/adc/adi,ad7292.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ patternProperties:
6161
required:
6262
- reg
6363

64-
additionalProperties: true
64+
additionalProperties: false
6565

6666
allOf:
6767
- $ref: /schemas/spi/spi-peripheral-props.yaml#

‎Documentation/devicetree/bindings/iio/light/rohm,bu27010.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,6 @@ examples:
4545
light-sensor@38 {
4646
compatible = "rohm,bu27010";
4747
reg = <0x38>;
48+
vdd-supply = <&vdd>;
4849
};
4950
};

‎Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,12 @@ properties:
106106
$ref: /schemas/types.yaml#/definitions/uint32
107107
maximum: 4096
108108

109+
dma-noncoherent:
110+
description:
111+
Present if the GIC redistributors permit programming shareability
112+
and cacheability attributes but are connected to a non-coherent
113+
downstream interconnect.
114+
109115
msi-controller:
110116
description:
111117
Only present if the Message Based Interrupt functionality is
@@ -193,6 +199,12 @@ patternProperties:
193199
compatible:
194200
const: arm,gic-v3-its
195201

202+
dma-noncoherent:
203+
description:
204+
Present if the GIC ITS permits programming shareability and
205+
cacheability attributes but is connected to a non-coherent
206+
downstream interconnect.
207+
196208
msi-controller: true
197209

198210
"#msi-cells":

‎Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ properties:
3737
- renesas,intc-ex-r8a77990 # R-Car E3
3838
- renesas,intc-ex-r8a77995 # R-Car D3
3939
- renesas,intc-ex-r8a779a0 # R-Car V3U
40+
- renesas,intc-ex-r8a779f0 # R-Car S4-8
4041
- renesas,intc-ex-r8a779g0 # R-Car V4H
4142
- const: renesas,irqc
4243

0 commit comments

Comments
 (0)