Skip to content

Commit b477ab8

Browse files
committed
Merge tag 'asoc-fix-v7.0-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v7.0 Another smallish batch of fixes and quirks, these days it's AMD that is getting all the DMI entries added. We've got one core fix for a missing list initialisation with auxiliary devices, otherwise it's all fairly small things.
2 parents a0dafdb + e74c38e commit b477ab8

397 files changed

Lines changed: 5135 additions & 2065 deletions

File tree

Some content is hidden

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

.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@ Hans Verkuil <hverkuil@kernel.org> <hverkuil-cisco@xs4all.nl>
316316
Hans Verkuil <hverkuil@kernel.org> <hansverk@cisco.com>
317317
Hao Ge <hao.ge@linux.dev> <gehao@kylinos.cn>
318318
Harry Yoo <harry.yoo@oracle.com> <42.hyeyoo@gmail.com>
319+
Harry Yoo <harry@kernel.org> <harry.yoo@oracle.com>
319320
Heiko Carstens <hca@linux.ibm.com> <h.carstens@de.ibm.com>
320321
Heiko Carstens <hca@linux.ibm.com> <heiko.carstens@de.ibm.com>
321322
Heiko Stuebner <heiko@sntech.de> <heiko.stuebner@bqreaders.com>
@@ -587,6 +588,7 @@ Morten Welinder <terra@gnome.org>
587588
Morten Welinder <welinder@anemone.rentec.com>
588589
Morten Welinder <welinder@darter.rentec.com>
589590
Morten Welinder <welinder@troll.com>
591+
Muhammad Usama Anjum <usama.anjum@arm.com> <usama.anjum@collabora.com>
590592
Mukesh Ojha <quic_mojha@quicinc.com> <mojha@codeaurora.org>
591593
Muna Sinada <quic_msinada@quicinc.com> <msinada@codeaurora.org>
592594
Murali Nalajala <quic_mnalajal@quicinc.com> <mnalajal@codeaurora.org>

Documentation/PCI/pcieaer-howto.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,16 @@ In the example, 'Requester ID' means the ID of the device that sent
8585
the error message to the Root Port. Please refer to PCIe specs for other
8686
fields.
8787

88+
The 'TLP Header' is the prefix/header of the TLP that caused the error
89+
in raw hex format. To decode the TLP Header into human-readable form
90+
one may use tlp-tool:
91+
92+
https://github.com/mmpg-x86/tlp-tool
93+
94+
Example usage::
95+
96+
curl -L https://git.kernel.org/linus/2ca1c94ce0b6 | rtlp-tool --aer
97+
8898
AER Ratelimits
8999
--------------
90100

Documentation/core-api/dma-attributes.rst

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,33 @@ For architectures that require cache flushing for DMA coherence
149149
DMA_ATTR_MMIO will not perform any cache flushing. The address
150150
provided must never be mapped cacheable into the CPU.
151151

152-
DMA_ATTR_CPU_CACHE_CLEAN
153-
------------------------
154-
155-
This attribute indicates the CPU will not dirty any cacheline overlapping this
156-
DMA_FROM_DEVICE/DMA_BIDIRECTIONAL buffer while it is mapped. This allows
157-
multiple small buffers to safely share a cacheline without risk of data
158-
corruption, suppressing DMA debug warnings about overlapping mappings.
159-
All mappings sharing a cacheline should have this attribute.
152+
DMA_ATTR_DEBUGGING_IGNORE_CACHELINES
153+
------------------------------------
154+
155+
This attribute indicates that CPU cache lines may overlap for buffers mapped
156+
with DMA_FROM_DEVICE or DMA_BIDIRECTIONAL.
157+
158+
Such overlap may occur when callers map multiple small buffers that reside
159+
within the same cache line. In this case, callers must guarantee that the CPU
160+
will not dirty these cache lines after the mappings are established. When this
161+
condition is met, multiple buffers can safely share a cache line without risking
162+
data corruption.
163+
164+
All mappings that share a cache line must set this attribute to suppress DMA
165+
debug warnings about overlapping mappings.
166+
167+
DMA_ATTR_REQUIRE_COHERENT
168+
-------------------------
169+
170+
DMA mapping requests with the DMA_ATTR_REQUIRE_COHERENT fail on any
171+
system where SWIOTLB or cache management is required. This should only
172+
be used to support uAPI designs that require continuous HW DMA
173+
coherence with userspace processes, for example RDMA and DRM. At a
174+
minimum the memory being mapped must be userspace memory from
175+
pin_user_pages() or similar.
176+
177+
Drivers should consider using dma_mmap_pages() instead of this
178+
interface when building their uAPIs, when possible.
179+
180+
It must never be used in an in-kernel driver that only works with
181+
kernel memory.

Documentation/filesystems/overlayfs.rst

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,56 @@ controlled by the "uuid" mount option, which supports these values:
783783
mounted with "uuid=on".
784784

785785

786+
Durability and copy up
787+
----------------------
788+
789+
The fsync(2) system call ensures that the data and metadata of a file
790+
are safely written to the backing storage, which is expected to
791+
guarantee the existence of the information post system crash.
792+
793+
Without an fsync(2) call, there is no guarantee that the observed
794+
data after a system crash will be either the old or the new data, but
795+
in practice, the observed data after crash is often the old or new data
796+
or a mix of both.
797+
798+
When an overlayfs file is modified for the first time, copy up will
799+
create a copy of the lower file and its parent directories in the upper
800+
layer. Since the Linux filesystem API does not enforce any particular
801+
ordering on storing changes without explicit fsync(2) calls, in case
802+
of a system crash, the upper file could end up with no data at all
803+
(i.e. zeros), which would be an unusual outcome. To avoid this
804+
experience, overlayfs calls fsync(2) on the upper file before completing
805+
data copy up with rename(2) or link(2) to make the copy up "atomic".
806+
807+
By default, overlayfs does not explicitly call fsync(2) on copied up
808+
directories or on metadata-only copy up, so it provides no guarantee to
809+
persist the user's modification unless the user calls fsync(2).
810+
The fsync during copy up only guarantees that if a copy up is observed
811+
after a crash, the observed data is not zeroes or intermediate values
812+
from the copy up staging area.
813+
814+
On traditional local filesystems with a single journal (e.g. ext4, xfs),
815+
fsync on a file also persists the parent directory changes, because they
816+
are usually modified in the same transaction, so metadata durability during
817+
data copy up effectively comes for free. Overlayfs further limits risk by
818+
disallowing network filesystems as upper layer.
819+
820+
Overlayfs can be tuned to prefer performance or durability when storing
821+
to the underlying upper layer. This is controlled by the "fsync" mount
822+
option, which supports these values:
823+
824+
- "auto": (default)
825+
Call fsync(2) on upper file before completion of data copy up.
826+
No explicit fsync(2) on directory or metadata-only copy up.
827+
- "strict":
828+
Call fsync(2) on upper file and directories before completion of any
829+
copy up.
830+
- "volatile": [*]
831+
Prefer performance over durability (see `Volatile mount`_)
832+
833+
[*] The mount option "volatile" is an alias to "fsync=volatile".
834+
835+
786836
Volatile mount
787837
--------------
788838

Documentation/hwmon/adm1177.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ for details.
2727
Sysfs entries
2828
-------------
2929

30-
The following attributes are supported. Current maxim attribute
30+
The following attributes are supported. Current maximum attribute
3131
is read-write, all other attributes are read-only.
3232

33-
in0_input Measured voltage in microvolts.
33+
in0_input Measured voltage in millivolts.
3434

35-
curr1_input Measured current in microamperes.
36-
curr1_max_alarm Overcurrent alarm in microamperes.
35+
curr1_input Measured current in milliamperes.
36+
curr1_max Overcurrent shutdown threshold in milliamperes.

Documentation/hwmon/peci-cputemp.rst

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@ temp1_max Provides thermal control temperature of the CPU package
5151
temp1_crit Provides shutdown temperature of the CPU package which
5252
is also known as the maximum processor junction
5353
temperature, Tjmax or Tprochot.
54-
temp1_crit_hyst Provides the hysteresis value from Tcontrol to Tjmax of
55-
the CPU package.
54+
temp1_crit_hyst Provides the hysteresis temperature of the CPU
55+
package. Returns Tcontrol, the temperature at which
56+
the critical condition clears.
5657

5758
temp2_label "DTS"
5859
temp2_input Provides current temperature of the CPU package scaled
@@ -62,8 +63,9 @@ temp2_max Provides thermal control temperature of the CPU package
6263
temp2_crit Provides shutdown temperature of the CPU package which
6364
is also known as the maximum processor junction
6465
temperature, Tjmax or Tprochot.
65-
temp2_crit_hyst Provides the hysteresis value from Tcontrol to Tjmax of
66-
the CPU package.
66+
temp2_crit_hyst Provides the hysteresis temperature of the CPU
67+
package. Returns Tcontrol, the temperature at which
68+
the critical condition clears.
6769

6870
temp3_label "Tcontrol"
6971
temp3_input Provides current Tcontrol temperature of the CPU

Documentation/userspace-api/landlock.rst

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Landlock: unprivileged access control
88
=====================================
99

1010
:Author: Mickaël Salaün
11-
:Date: January 2026
11+
:Date: March 2026
1212

1313
The goal of Landlock is to enable restriction of ambient rights (e.g. global
1414
filesystem or network access) for a set of processes. Because Landlock
@@ -197,12 +197,27 @@ similar backwards compatibility check is needed for the restrict flags
197197

198198
.. code-block:: c
199199
200-
__u32 restrict_flags = LANDLOCK_RESTRICT_SELF_LOG_NEW_EXEC_ON;
201-
if (abi < 7) {
202-
/* Clear logging flags unsupported before ABI 7. */
200+
__u32 restrict_flags =
201+
LANDLOCK_RESTRICT_SELF_LOG_NEW_EXEC_ON |
202+
LANDLOCK_RESTRICT_SELF_TSYNC;
203+
switch (abi) {
204+
case 1 ... 6:
205+
/* Removes logging flags for ABI < 7 */
203206
restrict_flags &= ~(LANDLOCK_RESTRICT_SELF_LOG_SAME_EXEC_OFF |
204207
LANDLOCK_RESTRICT_SELF_LOG_NEW_EXEC_ON |
205208
LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_OFF);
209+
__attribute__((fallthrough));
210+
case 7:
211+
/*
212+
* Removes multithreaded enforcement flag for ABI < 8
213+
*
214+
* WARNING: Without this flag, calling landlock_restrict_self(2) is
215+
* only equivalent if the calling process is single-threaded. Below
216+
* ABI v8 (and as of ABI v8, when not using this flag), a Landlock
217+
* policy would only be enforced for the calling thread and its
218+
* children (and not for all threads, including parents and siblings).
219+
*/
220+
restrict_flags &= ~LANDLOCK_RESTRICT_SELF_TSYNC;
206221
}
207222
208223
The next step is to restrict the current thread from gaining more privileges

MAINTAINERS

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3986,7 +3986,7 @@ F: drivers/hwmon/asus-ec-sensors.c
39863986
ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
39873987
M: Corentin Chary <corentin.chary@gmail.com>
39883988
M: Luke D. Jones <luke@ljones.dev>
3989-
M: Denis Benato <benato.denis96@gmail.com>
3989+
M: Denis Benato <denis.benato@linux.dev>
39903990
L: platform-driver-x86@vger.kernel.org
39913991
S: Maintained
39923992
W: https://asus-linux.org/
@@ -8628,8 +8628,14 @@ F: drivers/gpu/drm/lima/
86288628
F: include/uapi/drm/lima_drm.h
86298629

86308630
DRM DRIVERS FOR LOONGSON
8631+
M: Jianmin Lv <lvjianmin@loongson.cn>
8632+
M: Qianhai Wu <wuqianhai@loongson.cn>
8633+
R: Huacai Chen <chenhuacai@kernel.org>
8634+
R: Mingcong Bai <jeffbai@aosc.io>
8635+
R: Xi Ruoyao <xry111@xry111.site>
8636+
R: Icenowy Zheng <zhengxingda@iscas.ac.cn>
86318637
L: dri-devel@lists.freedesktop.org
8632-
S: Orphan
8638+
S: Maintained
86338639
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
86348640
F: drivers/gpu/drm/loongson/
86358641

@@ -9613,7 +9619,12 @@ F: include/linux/ext2*
96139619

96149620
EXT4 FILE SYSTEM
96159621
M: "Theodore Ts'o" <tytso@mit.edu>
9616-
M: Andreas Dilger <adilger.kernel@dilger.ca>
9622+
R: Andreas Dilger <adilger.kernel@dilger.ca>
9623+
R: Baokun Li <libaokun@linux.alibaba.com>
9624+
R: Jan Kara <jack@suse.cz>
9625+
R: Ojaswin Mujoo <ojaswin@linux.ibm.com>
9626+
R: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
9627+
R: Zhang Yi <yi.zhang@huawei.com>
96179628
L: linux-ext4@vger.kernel.org
96189629
S: Maintained
96199630
W: http://ext4.wiki.kernel.org
@@ -12009,7 +12020,6 @@ I2C SUBSYSTEM
1200912020
M: Wolfram Sang <wsa+renesas@sang-engineering.com>
1201012021
L: linux-i2c@vger.kernel.org
1201112022
S: Maintained
12012-
W: https://i2c.wiki.kernel.org/
1201312023
Q: https://patchwork.ozlabs.org/project/linux-i2c/list/
1201412024
T: git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
1201512025
F: Documentation/i2c/
@@ -12035,7 +12045,6 @@ I2C SUBSYSTEM HOST DRIVERS
1203512045
M: Andi Shyti <andi.shyti@kernel.org>
1203612046
L: linux-i2c@vger.kernel.org
1203712047
S: Maintained
12038-
W: https://i2c.wiki.kernel.org/
1203912048
Q: https://patchwork.ozlabs.org/project/linux-i2c/list/
1204012049
T: git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git
1204112050
F: Documentation/devicetree/bindings/i2c/
@@ -16877,7 +16886,7 @@ M: Lorenzo Stoakes <ljs@kernel.org>
1687716886
R: Rik van Riel <riel@surriel.com>
1687816887
R: Liam R. Howlett <Liam.Howlett@oracle.com>
1687916888
R: Vlastimil Babka <vbabka@kernel.org>
16880-
R: Harry Yoo <harry.yoo@oracle.com>
16889+
R: Harry Yoo <harry@kernel.org>
1688116890
R: Jann Horn <jannh@google.com>
1688216891
L: linux-mm@kvack.org
1688316892
S: Maintained
@@ -24343,7 +24352,7 @@ F: drivers/nvmem/layouts/sl28vpd.c
2434324352

2434424353
SLAB ALLOCATOR
2434524354
M: Vlastimil Babka <vbabka@kernel.org>
24346-
M: Harry Yoo <harry.yoo@oracle.com>
24355+
M: Harry Yoo <harry@kernel.org>
2434724356
M: Andrew Morton <akpm@linux-foundation.org>
2434824357
R: Hao Li <hao.li@linux.dev>
2434924358
R: Christoph Lameter <cl@gentwo.org>

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 7
33
PATCHLEVEL = 0
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc5
5+
EXTRAVERSION = -rc6
66
NAME = Baby Opossum Posse
77

88
# *DOCUMENTATION*
@@ -1654,7 +1654,7 @@ CLEAN_FILES += vmlinux.symvers modules-only.symvers \
16541654
modules.builtin.ranges vmlinux.o.map vmlinux.unstripped \
16551655
compile_commands.json rust/test \
16561656
rust-project.json .vmlinux.objs .vmlinux.export.c \
1657-
.builtin-dtbs-list .builtin-dtb.S
1657+
.builtin-dtbs-list .builtin-dtbs.S
16581658

16591659
# Directories & files removed with 'make mrproper'
16601660
MRPROPER_FILES += include/config include/generated \

arch/arm64/kvm/at.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1753,7 +1753,7 @@ int __kvm_at_swap_desc(struct kvm *kvm, gpa_t ipa, u64 old, u64 new)
17531753
if (!writable)
17541754
return -EPERM;
17551755

1756-
ptep = (u64 __user *)hva + offset;
1756+
ptep = (void __user *)hva + offset;
17571757
if (cpus_have_final_cap(ARM64_HAS_LSE_ATOMICS))
17581758
r = __lse_swap_desc(ptep, old, new);
17591759
else

0 commit comments

Comments
 (0)