Skip to content

Commit f299cd1

Browse files
gregkhgregkh
committed
Merge 6.11-rc7 into usb-next
We need the USB fixes in here as well, and this also resolves the merge conflict in: drivers/usb/typec/ucsi/ucsi.c Reported-by: Stephen Rothwell <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2 parents 9c0c11b + da3ea35 commit f299cd1

File tree

354 files changed

+3174
-1896
lines changed

Some content is hidden

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

354 files changed

+3174
-1896
lines changed

‎.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ Amit Nischal <[email protected]> <[email protected]>
6060
Andi Kleen <[email protected]> <[email protected]>
6161
Andi Shyti <[email protected]> <[email protected]>
6262
Andreas Herrmann <[email protected]>
63+
Andreas Hindborg <[email protected]> <[email protected]>
6364
Andrej Shadura <[email protected]>
6465
Andrej Shadura <[email protected]> <[email protected]>
6566
Andrew Morton <[email protected]>
@@ -269,6 +270,7 @@ James Ketrenos <jketreno@io.(none)>
269270
Jan Glauber <[email protected]> <[email protected]>
270271
Jan Glauber <[email protected]> <[email protected]>
271272
Jan Glauber <[email protected]> <[email protected]>
273+
Jan Kuliga <[email protected]> <[email protected]>
272274
Jarkko Sakkinen <[email protected]> <[email protected]>
273275
Jarkko Sakkinen <[email protected]> <[email protected]>
274276
Jarkko Sakkinen <[email protected]> <[email protected]>

‎Documentation/ABI/testing/sysfs-timecard

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -258,24 +258,29 @@ Description: (RW) When retrieving the PHC with the PTP SYS_OFFSET_EXTENDED
258258
the estimated point where the FPGA latches the PHC time. This
259259
value may be changed by writing an unsigned integer.
260260

261-
What: /sys/class/timecard/ocpN/ttyGNSS
262-
What: /sys/class/timecard/ocpN/ttyGNSS2
263-
Date: September 2021
261+
What: /sys/class/timecard/ocpN/tty
262+
Date: August 2024
263+
Contact: Vadim Fedorenko <[email protected]>
264+
Description: (RO) Directory containing the sysfs nodes for TTY attributes
265+
266+
What: /sys/class/timecard/ocpN/tty/ttyGNSS
267+
What: /sys/class/timecard/ocpN/tty/ttyGNSS2
268+
Date: August 2024
264269
Contact: Jonathan Lemon <[email protected]>
265-
Description: These optional attributes link to the TTY serial ports
266-
associated with the GNSS devices.
270+
Description: (RO) These optional attributes contain names of the TTY serial
271+
ports associated with the GNSS devices.
267272

268-
What: /sys/class/timecard/ocpN/ttyMAC
269-
Date: September 2021
273+
What: /sys/class/timecard/ocpN/tty/ttyMAC
274+
Date: August 2024
270275
Contact: Jonathan Lemon <[email protected]>
271-
Description: This optional attribute links to the TTY serial port
272-
associated with the Miniature Atomic Clock.
276+
Description: (RO) This optional attribute contains name of the TTY serial
277+
port associated with the Miniature Atomic Clock.
273278

274-
What: /sys/class/timecard/ocpN/ttyNMEA
275-
Date: September 2021
279+
What: /sys/class/timecard/ocpN/tty/ttyNMEA
280+
Date: August 2024
276281
Contact: Jonathan Lemon <[email protected]>
277-
Description: This optional attribute links to the TTY serial port
278-
which outputs the PHC time in NMEA ZDA format.
282+
Description: (RO) This optional attribute contains name of the TTY serial
283+
port which outputs the PHC time in NMEA ZDA format.
279284

280285
What: /sys/class/timecard/ocpN/utc_tai_offset
281286
Date: September 2021

‎Documentation/admin-guide/cgroup-v2.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1717,9 +1717,10 @@ The following nested keys are defined.
17171717
entries fault back in or are written out to disk.
17181718

17191719
memory.zswap.writeback
1720-
A read-write single value file. The default value is "1". The
1721-
initial value of the root cgroup is 1, and when a new cgroup is
1722-
created, it inherits the current value of its parent.
1720+
A read-write single value file. The default value is "1".
1721+
Note that this setting is hierarchical, i.e. the writeback would be
1722+
implicitly disabled for child cgroups if the upper hierarchy
1723+
does so.
17231724

17241725
When this is set to 0, all swapping attempts to swapping devices
17251726
are disabled. This included both zswap writebacks, and swapping due

‎Documentation/arch/riscv/vm-layout.rst

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -134,19 +134,3 @@ RISC-V Linux Kernel SV57
134134
ffffffff00000000 | -4 GB | ffffffff7fffffff | 2 GB | modules, BPF
135135
ffffffff80000000 | -2 GB | ffffffffffffffff | 2 GB | kernel
136136
__________________|____________|__________________|_________|____________________________________________________________
137-
138-
139-
Userspace VAs
140-
--------------------
141-
To maintain compatibility with software that relies on the VA space with a
142-
maximum of 48 bits the kernel will, by default, return virtual addresses to
143-
userspace from a 48-bit range (sv48). This default behavior is achieved by
144-
passing 0 into the hint address parameter of mmap. On CPUs with an address space
145-
smaller than sv48, the CPU maximum supported address space will be the default.
146-
147-
Software can "opt-in" to receiving VAs from another VA space by providing
148-
a hint address to mmap. When a hint address is passed to mmap, the returned
149-
address will never use more bits than the hint address. For example, if a hint
150-
address of `1 << 40` is passed to mmap, a valid returned address will never use
151-
bits 41 through 63. If no mappable addresses are available in that range, mmap
152-
will return `MAP_FAILED`.

‎Documentation/devicetree/bindings/display/panel/wl-355608-a8.yaml renamed to ‎Documentation/devicetree/bindings/display/panel/anbernic,rg35xx-plus-panel.yaml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/display/panel/wl-355608-a8.yaml#
4+
$id: http://devicetree.org/schemas/display/panel/anbernic,rg35xx-plus-panel.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: WL-355608-A8 3.5" (640x480 pixels) 24-bit IPS LCD panel
7+
title: Anbernic RG35XX series (WL-355608-A8) 3.5" 640x480 24-bit IPS LCD panel
88

99
maintainers:
1010
- Ryan Walklin <[email protected]>
@@ -15,7 +15,14 @@ allOf:
1515

1616
properties:
1717
compatible:
18-
const: wl-355608-a8
18+
oneOf:
19+
- const: anbernic,rg35xx-plus-panel
20+
- items:
21+
- enum:
22+
- anbernic,rg35xx-2024-panel
23+
- anbernic,rg35xx-h-panel
24+
- anbernic,rg35xx-sp-panel
25+
- const: anbernic,rg35xx-plus-panel
1926

2027
reg:
2128
maxItems: 1
@@ -40,7 +47,7 @@ examples:
4047
#size-cells = <0>;
4148
4249
panel@0 {
43-
compatible = "wl-355608-a8";
50+
compatible = "anbernic,rg35xx-plus-panel";
4451
reg = <0>;
4552
4653
spi-3wire;

‎Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ unevaluatedProperties: false
2828

2929
examples:
3030
- |
31-
nvmem {
31+
soc-nvmem {
3232
compatible = "xlnx,zynqmp-nvmem-fw";
3333
nvmem-layout {
3434
compatible = "fixed-layout";

‎Documentation/process/maintainer-netdev.rst

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,22 @@ When working in existing code which uses nonstandard formatting make
375375
your code follow the most recent guidelines, so that eventually all code
376376
in the domain of netdev is in the preferred format.
377377

378+
Using device-managed and cleanup.h constructs
379+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
380+
381+
Netdev remains skeptical about promises of all "auto-cleanup" APIs,
382+
including even ``devm_`` helpers, historically. They are not the preferred
383+
style of implementation, merely an acceptable one.
384+
385+
Use of ``guard()`` is discouraged within any function longer than 20 lines,
386+
``scoped_guard()`` is considered more readable. Using normal lock/unlock is
387+
still (weakly) preferred.
388+
389+
Low level cleanup constructs (such as ``__free()``) can be used when building
390+
APIs and helpers, especially scoped iterators. However, direct use of
391+
``__free()`` within networking core and drivers is discouraged.
392+
Similar guidance applies to declaring variables mid-function.
393+
378394
Resending after review
379395
~~~~~~~~~~~~~~~~~~~~~~
380396

‎Documentation/rust/coding-guidelines.rst

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -145,32 +145,32 @@ This is how a well-documented Rust function may look like:
145145
This example showcases a few ``rustdoc`` features and some conventions followed
146146
in the kernel:
147147

148-
- The first paragraph must be a single sentence briefly describing what
149-
the documented item does. Further explanations must go in extra paragraphs.
148+
- The first paragraph must be a single sentence briefly describing what
149+
the documented item does. Further explanations must go in extra paragraphs.
150150

151-
- Unsafe functions must document their safety preconditions under
152-
a ``# Safety`` section.
151+
- Unsafe functions must document their safety preconditions under
152+
a ``# Safety`` section.
153153

154-
- While not shown here, if a function may panic, the conditions under which
155-
that happens must be described under a ``# Panics`` section.
154+
- While not shown here, if a function may panic, the conditions under which
155+
that happens must be described under a ``# Panics`` section.
156156

157-
Please note that panicking should be very rare and used only with a good
158-
reason. In almost all cases, a fallible approach should be used, typically
159-
returning a ``Result``.
157+
Please note that panicking should be very rare and used only with a good
158+
reason. In almost all cases, a fallible approach should be used, typically
159+
returning a ``Result``.
160160

161-
- If providing examples of usage would help readers, they must be written in
162-
a section called ``# Examples``.
161+
- If providing examples of usage would help readers, they must be written in
162+
a section called ``# Examples``.
163163

164-
- Rust items (functions, types, constants...) must be linked appropriately
165-
(``rustdoc`` will create a link automatically).
164+
- Rust items (functions, types, constants...) must be linked appropriately
165+
(``rustdoc`` will create a link automatically).
166166

167-
- Any ``unsafe`` block must be preceded by a ``// SAFETY:`` comment
168-
describing why the code inside is sound.
167+
- Any ``unsafe`` block must be preceded by a ``// SAFETY:`` comment
168+
describing why the code inside is sound.
169169

170-
While sometimes the reason might look trivial and therefore unneeded,
171-
writing these comments is not just a good way of documenting what has been
172-
taken into account, but most importantly, it provides a way to know that
173-
there are no *extra* implicit constraints.
170+
While sometimes the reason might look trivial and therefore unneeded,
171+
writing these comments is not just a good way of documenting what has been
172+
taken into account, but most importantly, it provides a way to know that
173+
there are no *extra* implicit constraints.
174174

175175
To learn more about how to write documentation for Rust and extra features,
176176
please take a look at the ``rustdoc`` book at:

‎Documentation/rust/quick-start.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ If GDB/Binutils is used and Rust symbols are not getting demangled, the reason
305305
is the toolchain does not support Rust's new v0 mangling scheme yet.
306306
There are a few ways out:
307307

308-
- Install a newer release (GDB >= 10.2, Binutils >= 2.36).
308+
- Install a newer release (GDB >= 10.2, Binutils >= 2.36).
309309

310-
- Some versions of GDB (e.g. vanilla GDB 10.1) are able to use
311-
the pre-demangled names embedded in the debug info (``CONFIG_DEBUG_INFO``).
310+
- Some versions of GDB (e.g. vanilla GDB 10.1) are able to use
311+
the pre-demangled names embedded in the debug info (``CONFIG_DEBUG_INFO``).

‎MAINTAINERS

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3868,7 +3868,7 @@ F: kernel/trace/blktrace.c
38683868
F: lib/sbitmap.c
38693869

38703870
BLOCK LAYER DEVICE DRIVER API [RUST]
3871-
M: Andreas Hindborg <a.hindborg@samsung.com>
3871+
M: Andreas Hindborg <a.hindborg@kernel.org>
38723872
R: Boqun Feng <[email protected]>
38733873
L: [email protected]
38743874
L: [email protected]
@@ -5956,6 +5956,7 @@ F: Documentation/process/cve.rst
59565956
CW1200 WLAN driver
59575957
S: Orphan
59585958
F: drivers/net/wireless/st/cw1200/
5959+
F: include/linux/platform_data/net-cw1200.h
59595960

59605961
CX18 VIDEO4LINUX DRIVER
59615962
M: Andy Walls <[email protected]>
@@ -7457,8 +7458,8 @@ S: Maintained
74577458
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
74587459
F: Documentation/devicetree/bindings/display/bridge/
74597460
F: drivers/gpu/drm/bridge/
7461+
F: drivers/gpu/drm/display/drm_bridge_connector.c
74607462
F: drivers/gpu/drm/drm_bridge.c
7461-
F: drivers/gpu/drm/drm_bridge_connector.c
74627463
F: include/drm/drm_bridge.h
74637464
F: include/drm/drm_bridge_connector.h
74647465

@@ -8864,6 +8865,7 @@ F: drivers/dma/fsldma.*
88648865
FREESCALE DSPI DRIVER
88658866
M: Vladimir Oltean <[email protected]>
88668867
L: [email protected]
8868+
L: [email protected]
88678869
S: Maintained
88688870
F: Documentation/devicetree/bindings/spi/fsl,dspi*.yaml
88698871
F: drivers/spi/spi-fsl-dspi.c
@@ -8948,6 +8950,14 @@ S: Maintained
89488950
F: Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
89498951
F: drivers/i2c/busses/i2c-imx-lpi2c.c
89508952

8953+
FREESCALE IMX LPSPI DRIVER
8954+
M: Frank Li <[email protected]>
8955+
L: [email protected]
8956+
L: [email protected]
8957+
S: Maintained
8958+
F: Documentation/devicetree/bindings/spi/spi-fsl-lpspi.yaml
8959+
F: drivers/spi/spi-fsl-lpspi.c
8960+
89518961
FREESCALE MPC I2C DRIVER
89528962
M: Chris Packham <[email protected]>
89538963
L: [email protected]
@@ -8984,6 +8994,7 @@ F: include/linux/fsl/ptp_qoriq.h
89848994
FREESCALE QUAD SPI DRIVER
89858995
M: Han Xu <[email protected]>
89868996
L: [email protected]
8997+
L: [email protected]
89878998
S: Maintained
89888999
F: Documentation/devicetree/bindings/spi/fsl,spi-fsl-qspi.yaml
89899000
F: drivers/spi/spi-fsl-qspi.c
@@ -15895,6 +15906,8 @@ F: include/uapi/linux/ethtool_netlink.h
1589515906
F: include/uapi/linux/if_*
1589615907
F: include/uapi/linux/netdev*
1589715908
F: tools/testing/selftests/drivers/net/
15909+
X: Documentation/devicetree/bindings/net/bluetooth/
15910+
X: Documentation/devicetree/bindings/net/wireless/
1589815911
X: drivers/net/wireless/
1589915912

1590015913
NETWORKING DRIVERS (WIRELESS)
@@ -16408,6 +16421,7 @@ M: Han Xu <[email protected]>
1640816421
M: Haibo Chen <[email protected]>
1640916422
R: Yogesh Gaur <[email protected]>
1641016423
L: [email protected]
16424+
L: [email protected]
1641116425
S: Maintained
1641216426
F: Documentation/devicetree/bindings/spi/spi-nxp-fspi.yaml
1641316427
F: drivers/spi/spi-nxp-fspi.c
@@ -17119,7 +17133,7 @@ F: include/dt-bindings/
1711917133

1712017134
OPENCOMPUTE PTP CLOCK DRIVER
1712117135
M: Jonathan Lemon <[email protected]>
17122-
M: Vadim Fedorenko <vadfed@linux.dev>
17136+
M: Vadim Fedorenko <vadim.fedorenko@linux.dev>
1712317137
L: [email protected]
1712417138
S: Maintained
1712517139
F: drivers/ptp/ptp_ocp.c
@@ -19932,12 +19946,11 @@ F: tools/verification/
1993219946
RUST
1993319947
M: Miguel Ojeda <[email protected]>
1993419948
M: Alex Gaynor <[email protected]>
19935-
M: Wedson Almeida Filho <[email protected]>
1993619949
R: Boqun Feng <[email protected]>
1993719950
R: Gary Guo <[email protected]>
1993819951
R: Björn Roy Baron <[email protected]>
1993919952
R: Benno Lossin <[email protected]>
19940-
R: Andreas Hindborg <a.hindborg@samsung.com>
19953+
R: Andreas Hindborg <a.hindborg@kernel.org>
1994119954
R: Alice Ryhl <[email protected]>
1994219955
L: [email protected]
1994319956
S: Supported

0 commit comments

Comments
 (0)