Skip to content

Commit 0542972

Browse files
committed
Merge branch 'for-linus' into for-next
Pull 7.0 devel branch for further cleanups of ctxfi driver & co. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2 parents 579e7b8 + a0dafdb commit 0542972

1,661 files changed

Lines changed: 21489 additions & 10607 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: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,16 @@ Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
210210
Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>
211211
Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
212212
Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
213+
Daniel Lezcano <daniel.lezcano@kernel.org> <daniel.lezcano@linaro.org>
214+
Daniel Lezcano <daniel.lezcano@kernel.org> <daniel.lezcano@free.fr>
215+
Daniel Lezcano <daniel.lezcano@kernel.org> <daniel.lezcano@linexp.org>
216+
Daniel Lezcano <daniel.lezcano@kernel.org> <dlezcano@fr.ibm.com>
213217
Daniel Thompson <danielt@kernel.org> <daniel.thompson@linaro.org>
218+
Daniele Alessandrelli <daniele.alessandrelli@gmail.com> <daniele.alessandrelli@intel.com>
214219
Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com>
215220
David Brownell <david-b@pacbell.net>
216221
David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>
222+
David Gow <david@davidgow.net> <davidgow@google.com>
217223
David Heidelberg <david@ixit.cz> <d.okias@gmail.com>
218224
David Hildenbrand <david@kernel.org> <david@redhat.com>
219225
David Rheinsberg <david@readahead.eu> <dh.herrmann@gmail.com>
@@ -321,6 +327,7 @@ Henrik Rydberg <rydberg@bitmath.org>
321327
Herbert Xu <herbert@gondor.apana.org.au>
322328
Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>
323329
Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>
330+
Ignat Korchagin <ignat@linux.win> <ignat@cloudflare.com>
324331
Ike Panhc <ikepanhc@gmail.com> <ike.pan@canonical.com>
325332
J. Bruce Fields <bfields@fieldses.org> <bfields@redhat.com>
326333
J. Bruce Fields <bfields@fieldses.org> <bfields@citi.umich.edu>
@@ -348,6 +355,7 @@ Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@opinsys.com>
348355
Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
349356
Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>
350357
Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
358+
Jason Xing <kerneljasonxing@gmail.com> <kernelxing@tencent.com>
351359
<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
352360
Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
353361
Jayachandran C <c.jayachandran@gmail.com> <jayachandranc@netlogicmicro.com>
@@ -396,6 +404,7 @@ Jiri Slaby <jirislaby@kernel.org> <xslaby@fi.muni.cz>
396404
Jisheng Zhang <jszhang@kernel.org> <jszhang@marvell.com>
397405
Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>
398406
Jishnu Prakash <quic_jprakash@quicinc.com> <jprakash@codeaurora.org>
407+
Joe Damato <joe@dama.to> <jdamato@fastly.com>
399408
Joel Granados <joel.granados@kernel.org> <j.granados@samsung.com>
400409
Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
401410
Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
@@ -490,7 +499,8 @@ Lior David <quic_liord@quicinc.com> <liord@codeaurora.org>
490499
Loic Poulain <loic.poulain@oss.qualcomm.com> <loic.poulain@linaro.org>
491500
Loic Poulain <loic.poulain@oss.qualcomm.com> <loic.poulain@intel.com>
492501
Lorenzo Pieralisi <lpieralisi@kernel.org> <lorenzo.pieralisi@arm.com>
493-
Lorenzo Stoakes <lorenzo.stoakes@oracle.com> <lstoakes@gmail.com>
502+
Lorenzo Stoakes <ljs@kernel.org> <lstoakes@gmail.com>
503+
Lorenzo Stoakes <ljs@kernel.org> <lorenzo.stoakes@oracle.com>
494504
Luca Ceresoli <luca.ceresoli@bootlin.com> <luca@lucaceresoli.net>
495505
Luca Weiss <luca@lucaweiss.eu> <luca@z3ntu.xyz>
496506
Lucas De Marchi <demarchi@kernel.org> <lucas.demarchi@intel.com>
@@ -876,6 +886,7 @@ Vivien Didelot <vivien.didelot@gmail.com> <vivien.didelot@savoirfairelinux.com>
876886
Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>
877887
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
878888
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
889+
Vlastimil Babka <vbabka@kernel.org> <vbabka@suse.cz>
879890
WangYuli <wangyuli@aosc.io> <wangyl5933@chinaunicom.cn>
880891
WangYuli <wangyuli@aosc.io> <wangyuli@deepin.org>
881892
Weiwen Hu <huweiwen@linux.alibaba.com> <sehuww@mail.scut.edu.cn>
@@ -890,7 +901,8 @@ Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
890901
Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>
891902
Yixun Lan <dlan@kernel.org> <dlan@gentoo.org>
892903
Yixun Lan <dlan@kernel.org> <yixun.lan@amlogic.com>
893-
Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>
904+
Yosry Ahmed <yosry@kernel.org> <yosryahmed@google.com>
905+
Yosry Ahmed <yosry@kernel.org> <yosry.ahmed@linux.dev>
894906
Yu-Chun Lin <eleanor.lin@realtek.com> <eleanor15x@gmail.com>
895907
Yusuke Goda <goda.yusuke@renesas.com>
896908
Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>

CREDITS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,6 +1242,10 @@ N: Veaceslav Falico
12421242
E: vfalico@gmail.com
12431243
D: Co-maintainer and co-author of the network bonding driver.
12441244

1245+
N: Thomas Falcon
1246+
E: tlfalcon@linux.ibm.com
1247+
D: Initial author of the IBM ibmvnic network driver
1248+
12451249
N: János Farkas
12461250
E: chexum@shadow.banki.hu
12471251
D: romfs, various (mostly networking) fixes
@@ -2415,6 +2419,10 @@ S: Am Muehlenweg 38
24152419
S: D53424 Remagen
24162420
S: Germany
24172421

2422+
N: Jonathan Lemon
2423+
E: jonathan.lemon@gmail.com
2424+
D: OpenCompute PTP clock driver (ptp_ocp)
2425+
24182426
N: Colin Leroy
24192427
E: colin@colino.net
24202428
W: http://www.geekounet.org/

Documentation/ABI/testing/sysfs-block-zram

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,11 @@ Description:
151151
The algorithm_params file is write-only and is used to setup
152152
compression algorithm parameters.
153153

154-
What: /sys/block/zram<id>/writeback_compressed
154+
What: /sys/block/zram<id>/compressed_writeback
155155
Date: Decemeber 2025
156156
Contact: Richard Chang <richardycc@google.com>
157157
Description:
158-
The writeback_compressed device atrribute toggles compressed
158+
The compressed_writeback device atrribute toggles compressed
159159
writeback feature.
160160

161161
What: /sys/block/zram<id>/writeback_batch_size

Documentation/ABI/testing/sysfs-driver-uniwill-laptop

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/bus/platform/devices/INOU0000:XX/fn_lock_toggle_enable
1+
What: /sys/bus/platform/devices/INOU0000:XX/fn_lock
22
Date: November 2025
33
KernelVersion: 6.19
44
Contact: Armin Wolf <W_Armin@gmx.de>
@@ -8,15 +8,15 @@ Description:
88

99
Reading this file returns the current enable status of the FN lock functionality.
1010

11-
What: /sys/bus/platform/devices/INOU0000:XX/super_key_toggle_enable
11+
What: /sys/bus/platform/devices/INOU0000:XX/super_key_enable
1212
Date: November 2025
1313
KernelVersion: 6.19
1414
Contact: Armin Wolf <W_Armin@gmx.de>
1515
Description:
16-
Allows userspace applications to enable/disable the super key functionality
17-
of the integrated keyboard by writing "1"/"0" into this file.
16+
Allows userspace applications to enable/disable the super key of the integrated
17+
keyboard by writing "1"/"0" into this file.
1818

19-
Reading this file returns the current enable status of the super key functionality.
19+
Reading this file returns the current enable status of the super key.
2020

2121
What: /sys/bus/platform/devices/INOU0000:XX/touchpad_toggle_enable
2222
Date: November 2025

Documentation/admin-guide/blockdev/zram.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ writeback_limit WO specifies the maximum amount of write IO zram
216216
writeback_limit_enable RW show and set writeback_limit feature
217217
writeback_batch_size RW show and set maximum number of in-flight
218218
writeback operations
219-
writeback_compressed RW show and set compressed writeback feature
219+
compressed_writeback RW show and set compressed writeback feature
220220
comp_algorithm RW show and change the compression algorithm
221221
algorithm_params WO setup compression algorithm parameters
222222
compact WO trigger memory compaction
@@ -439,11 +439,11 @@ budget in next setting is user's job.
439439
By default zram stores written back pages in decompressed (raw) form, which
440440
means that writeback operation involves decompression of the page before
441441
writing it to the backing device. This behavior can be changed by enabling
442-
`writeback_compressed` feature, which causes zram to write compressed pages
442+
`compressed_writeback` feature, which causes zram to write compressed pages
443443
to the backing device, thus avoiding decompression overhead. To enable
444444
this feature, execute::
445445

446-
$ echo yes > /sys/block/zramX/writeback_compressed
446+
$ echo yes > /sys/block/zramX/compressed_writeback
447447

448448
Note that this feature should be configured before the `zramX` device is
449449
initialized.

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
TPM TPM drivers are enabled.
7575
UMS USB Mass Storage support is enabled.
7676
USB USB support is enabled.
77+
NVME NVMe support is enabled
7778
USBHID USB Human Interface Device support is enabled.
7879
V4L Video For Linux support is enabled.
7980
VGA The VGA console has been enabled.
@@ -4787,6 +4788,18 @@ Kernel parameters
47874788
This can be set from sysctl after boot.
47884789
See Documentation/admin-guide/sysctl/vm.rst for details.
47894790

4791+
nvme.quirks= [NVME] A list of quirk entries to augment the built-in
4792+
nvme quirk list. List entries are separated by a
4793+
'-' character.
4794+
Each entry has the form VendorID:ProductID:quirk_names.
4795+
The IDs are 4-digits hex numbers and quirk_names is a
4796+
list of quirk names separated by commas. A quirk name
4797+
can be prefixed by '^', meaning that the specified
4798+
quirk must be disabled.
4799+
4800+
Example:
4801+
nvme.quirks=7710:2267:bogus_nid,^identify_cns-9900:7711:broken_msi
4802+
47904803
ohci1394_dma=early [HW,EARLY] enable debugging via the ohci1394 driver.
47914804
See Documentation/core-api/debugging-via-ohci1394.rst for more
47924805
info.
@@ -8183,6 +8196,9 @@ Kernel parameters
81838196
p = USB_QUIRK_SHORT_SET_ADDRESS_REQ_TIMEOUT
81848197
(Reduce timeout of the SET_ADDRESS
81858198
request from 5000 ms to 500 ms);
8199+
q = USB_QUIRK_FORCE_ONE_CONFIG (Device
8200+
claims zero configurations,
8201+
forcing to 1);
81868202
Example: quirks=0781:5580:bk,0a5c:5834:gij
81878203

81888204
usbhid.mousepoll=

Documentation/admin-guide/laptops/uniwill-laptop.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Keyboard settings
2424

2525
The ``uniwill-laptop`` driver allows the user to enable/disable:
2626

27-
- the FN and super key lock functionality of the integrated keyboard
27+
- the FN lock and super key of the integrated keyboard
2828
- the touchpad toggle functionality of the integrated touchpad
2929

3030
See Documentation/ABI/testing/sysfs-driver-uniwill-laptop for details.

Documentation/admin-guide/sysctl/net.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,9 @@ Values:
594594
their sockets will only be able to connect within their own
595595
namespace.
596596

597+
The first write to ``child_ns_mode`` locks its value. Subsequent writes of the
598+
same value succeed, but writing a different value returns ``-EBUSY``.
599+
597600
Changing ``child_ns_mode`` only affects namespaces created after the change;
598601
it does not modify the current namespace or any existing children.
599602

Documentation/dev-tools/kunit/run_wrapper.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,8 @@ command line arguments:
336336
- ``--list_tests_attr``: If set, lists all tests that will be run and all of their
337337
attributes.
338338

339+
- ``--list_suites``: If set, lists all suites that will be run.
340+
339341
Command-line completion
340342
==============================
341343

Documentation/devicetree/bindings/display/msm/dp-controller.yaml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ allOf:
253253
enum:
254254
# these platforms support 2 streams MST on some interfaces,
255255
# others are SST only
256-
- qcom,glymur-dp
257256
- qcom,sc8280xp-dp
258257
- qcom,x1e80100-dp
259258
then:
@@ -310,6 +309,26 @@ allOf:
310309
minItems: 6
311310
maxItems: 8
312311

312+
- if:
313+
properties:
314+
compatible:
315+
contains:
316+
enum:
317+
# these platforms support 2 streams MST on some interfaces,
318+
# others are SST only, but all controllers have 4 ports
319+
- qcom,glymur-dp
320+
then:
321+
properties:
322+
reg:
323+
minItems: 9
324+
maxItems: 9
325+
clocks:
326+
minItems: 5
327+
maxItems: 6
328+
clocks-names:
329+
minItems: 5
330+
maxItems: 6
331+
313332
unevaluatedProperties: false
314333

315334
examples:

0 commit comments

Comments
 (0)