Skip to content

Commit 946661e

Browse files
committed
Merge branch 'next' into for-linus
Prepare input updates for 6.15 merge window.
2 parents fd10709 + 4d395cb commit 946661e

File tree

10,012 files changed

+444807
-148002
lines changed

Some content is hidden

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

10,012 files changed

+444807
-148002
lines changed

.clippy.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22

3+
msrv = "1.78.0"
4+
35
check-private-items = true
46

57
disallowed-macros = [

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
*.dtb.S
2323
*.dtbo.S
2424
*.dwo
25+
*.dylib
2526
*.elf
2627
*.gcno
2728
*.gcda

.mailmap

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,13 @@ Anirudh Ghayal <quic_aghayal@quicinc.com> <aghayal@codeaurora.org>
8383
Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>
8484
Antoine Tenart <atenart@kernel.org> <antoine.tenart@free-electrons.com>
8585
Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
86+
Antonio Quartulli <antonio@mandelbit.com> <antonio@meshcoding.com>
87+
Antonio Quartulli <antonio@mandelbit.com> <antonio@open-mesh.com>
88+
Antonio Quartulli <antonio@mandelbit.com> <antonio.quartulli@open-mesh.com>
89+
Antonio Quartulli <antonio@mandelbit.com> <ordex@autistici.org>
90+
Antonio Quartulli <antonio@mandelbit.com> <ordex@ritirata.org>
91+
Antonio Quartulli <antonio@mandelbit.com> <antonio@openvpn.net>
92+
Antonio Quartulli <antonio@mandelbit.com> <a@unstable.cc>
8693
Anup Patel <anup@brainfault.org> <anup.patel@wdc.com>
8794
Archit Taneja <archit@ti.com>
8895
Ard Biesheuvel <ardb@kernel.org> <ard.biesheuvel@linaro.org>
@@ -121,6 +128,8 @@ Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>
121128
Benjamin Poirier <benjamin.poirier@gmail.com> <bpoirier@suse.de>
122129
Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@gmail.com>
123130
Benjamin Tissoires <bentiss@kernel.org> <benjamin.tissoires@redhat.com>
131+
Bingwu Zhang <xtex@aosc.io> <xtexchooser@duck.com>
132+
Bingwu Zhang <xtex@aosc.io> <xtex@xtexx.eu.org>
124133
Bjorn Andersson <andersson@kernel.org> <bjorn@kryo.se>
125134
Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@linaro.org>
126135
Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@sonymobile.com>
@@ -133,13 +142,17 @@ Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
133142
Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>
134143
Brendan Higgins <brendan.higgins@linux.dev> <brendanhiggins@google.com>
135144
Brian Avery <b.avery@hp.com>
145+
Brian Cain <bcain@kernel.org> <brian.cain@oss.qualcomm.com>
146+
Brian Cain <bcain@kernel.org> <bcain@quicinc.com>
136147
Brian King <brking@us.ibm.com>
137148
Brian Silverman <bsilver16384@gmail.com> <brian.silverman@bluerivertech.com>
138149
Bryan Tan <bryan-bt.tan@broadcom.com> <bryantan@vmware.com>
139150
Cai Huoqing <cai.huoqing@linux.dev> <caihuoqing@baidu.com>
140151
Can Guo <quic_cang@quicinc.com> <cang@codeaurora.org>
141152
Carl Huang <quic_cjhuang@quicinc.com> <cjhuang@codeaurora.org>
142-
Carlos Bilbao <carlos.bilbao.osdev@gmail.com> <carlos.bilbao@amd.com>
153+
Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao@amd.com>
154+
Carlos Bilbao <carlos.bilbao@kernel.org> <carlos.bilbao.osdev@gmail.com>
155+
Carlos Bilbao <carlos.bilbao@kernel.org> <bilbao@vt.edu>
143156
Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
144157
Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
145158
Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
@@ -156,6 +169,7 @@ Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com>
156169
Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>
157170
Christian Marangi <ansuelsmth@gmail.com>
158171
Christophe Ricard <christophe.ricard@gmail.com>
172+
Christopher Obbard <christopher.obbard@linaro.org> <chris.obbard@collabora.com>
159173
Christoph Hellwig <hch@lst.de>
160174
Chuck Lever <chuck.lever@oracle.com> <cel@kernel.org>
161175
Chuck Lever <chuck.lever@oracle.com> <cel@netapp.com>
@@ -200,6 +214,7 @@ Elliot Berman <quic_eberman@quicinc.com> <eberman@codeaurora.org>
200214
Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>
201215
Enric Balletbo i Serra <eballetbo@kernel.org> <eballetbo@iseebcn.com>
202216
Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
217+
Ethan Carter Edwards <ethan@ethancedwards.com> Ethan Edwards <ethancarteredwards@gmail.com>
203218
Eugen Hristev <eugen.hristev@linaro.org> <eugen.hristev@microchip.com>
204219
Eugen Hristev <eugen.hristev@linaro.org> <eugen.hristev@collabora.com>
205220
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
@@ -211,6 +226,7 @@ Fangrui Song <i@maskray.me> <maskray@google.com>
211226
Felipe W Damasio <felipewd@terra.com.br>
212227
Felix Kuhling <fxkuehl@gmx.de>
213228
Felix Moeller <felix@derklecks.de>
229+
Feng Tang <feng.79.tang@gmail.com> <feng.tang@intel.com>
214230
Fenglin Wu <quic_fenglinw@quicinc.com> <fenglinw@codeaurora.org>
215231
Filipe Lautert <filipe@icewall.org>
216232
Finn Thain <fthain@linux-m68k.org> <fthain@telegraphics.com.au>
@@ -251,6 +267,7 @@ Guo Ren <guoren@kernel.org> <ren_guo@c-sky.com>
251267
Guru Das Srinagesh <quic_gurus@quicinc.com> <gurus@codeaurora.org>
252268
Gustavo Padovan <gustavo@las.ic.unicamp.br>
253269
Gustavo Padovan <padovan@profusion.mobi>
270+
Hamza Mahfooz <hamzamahfooz@linux.microsoft.com> <hamza.mahfooz@amd.com>
254271
Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
255272
Hans Verkuil <hverkuil@xs4all.nl> <hansverk@cisco.com>
256273
Hans Verkuil <hverkuil@xs4all.nl> <hverkuil-cisco@xs4all.nl>
@@ -301,6 +318,8 @@ Jayachandran C <c.jayachandran@gmail.com> <jnair@caviumnetworks.com>
301318
Jean Tourrilhes <jt@hpl.hp.com>
302319
Jeevan Shriram <quic_jshriram@quicinc.com> <jshriram@codeaurora.org>
303320
Jeff Garzik <jgarzik@pretzel.yyz.us>
321+
Jeff Johnson <jeff.johnson@oss.qualcomm.com> <jjohnson@codeaurora.org>
322+
Jeff Johnson <jeff.johnson@oss.qualcomm.com> <quic_jjohnson@quicinc.com>
304323
Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>
305324
Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com>
306325
Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>
@@ -360,6 +379,7 @@ Juha Yrjola <juha.yrjola@solidboot.com>
360379
Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
361380
Iskren Chernev <me@iskren.info> <iskren.chernev@gmail.com>
362381
Kalle Valo <kvalo@kernel.org> <kvalo@codeaurora.org>
382+
Kalle Valo <kvalo@kernel.org> <quic_kvalo@quicinc.com>
363383
Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>
364384
Karthikeyan Periyasamy <quic_periyasa@quicinc.com> <periyasa@codeaurora.org>
365385
Kathiravan T <quic_kathirav@quicinc.com> <kathirav@codeaurora.org>
@@ -405,6 +425,7 @@ Liam Mark <quic_lmark@quicinc.com> <lmark@codeaurora.org>
405425
Linas Vepstas <linas@austin.ibm.com>
406426
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
407427
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
428+
Linus Lüssing <linus.luessing@c0d3.blue> <ll@simonwunderlich.de>
408429
<linux-hardening@vger.kernel.org> <kernel-hardening@lists.openwall.com>
409430
Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
410431
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
@@ -427,6 +448,8 @@ Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
427448
Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
428449
Marek Behún <kabel@kernel.org> <marek.behun@nic.cz>
429450
Marek Behún <kabel@kernel.org> Marek Behun <marek.behun@nic.cz>
451+
Marek Lindner <marek.lindner@mailbox.org> <lindner_marek@yahoo.de>
452+
Marek Lindner <marek.lindner@mailbox.org> <mareklindner@neomailbox.ch>
430453
Mark Brown <broonie@sirena.org.uk>
431454
Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com>
432455
Markus Schneider-Pargmann <msp@baylibre.com> <mpa@pengutronix.de>
@@ -435,7 +458,7 @@ Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
435458
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>
436459
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
437460
Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com> <martyna.szapar-mudlaw@intel.com>
438-
Mathieu Othacehe <m.othacehe@gmail.com> <othacehe@gnu.org>
461+
Mathieu Othacehe <othacehe@gnu.org> <m.othacehe@gmail.com>
439462
Mat Martineau <martineau@kernel.org> <mathew.j.martineau@linux.intel.com>
440463
Mat Martineau <martineau@kernel.org> <mathewm@codeaurora.org>
441464
Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>
@@ -511,6 +534,7 @@ Nicholas Piggin <npiggin@gmail.com> <npiggin@kernel.dk>
511534
Nicholas Piggin <npiggin@gmail.com> <npiggin@suse.de>
512535
Nicholas Piggin <npiggin@gmail.com> <nickpiggin@yahoo.com.au>
513536
Nicholas Piggin <npiggin@gmail.com> <piggin@cyberone.com.au>
537+
Nick Desaulniers <nick.desaulniers+lkml@gmail.com> <ndesaulniers@google.com>
514538
Nicolas Ferre <nicolas.ferre@microchip.com> <nicolas.ferre@atmel.com>
515539
Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
516540
Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
@@ -529,6 +553,8 @@ Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>
529553
Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>
530554
Oleksij Rempel <o.rempel@pengutronix.de>
531555
Oleksij Rempel <o.rempel@pengutronix.de> <ore@pengutronix.de>
556+
Oliver Hartkopp <socketcan@hartkopp.net> <oliver.hartkopp@volkswagen.de>
557+
Oliver Hartkopp <socketcan@hartkopp.net> <oliver@hartkopp.net>
532558
Oliver Upton <oliver.upton@linux.dev> <oupton@google.com>
533559
Ondřej Jirman <megi@xff.cz> <megous@megous.com>
534560
Oza Pawandeep <quic_poza@quicinc.com> <poza@codeaurora.org>
@@ -640,6 +666,11 @@ Simona Vetter <simona.vetter@ffwll.ch> <daniel@biene.ffwll.ch>
640666
Simon Horman <horms@kernel.org> <simon.horman@corigine.com>
641667
Simon Horman <horms@kernel.org> <simon.horman@netronome.com>
642668
Simon Kelley <simon@thekelleys.org.uk>
669+
Simon Wunderlich <sw@simonwunderlich.de> <simon.wunderlich@open-mesh.com>
670+
Simon Wunderlich <sw@simonwunderlich.de> <simon.wunderlich@s2003.tu-chemnitz.de>
671+
Simon Wunderlich <sw@simonwunderlich.de> <simon.wunderlich@saxnet.de>
672+
Simon Wunderlich <sw@simonwunderlich.de> <simon@open-mesh.com>
673+
Simon Wunderlich <sw@simonwunderlich.de> <siwu@hrz.tu-chemnitz.de>
643674
Sricharan Ramabadhran <quic_srichara@quicinc.com> <sricharan@codeaurora.org>
644675
Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org>
645676
Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org>
@@ -660,6 +691,11 @@ Sudarshan Rajagopalan <quic_sudaraja@quicinc.com> <sudaraja@codeaurora.org>
660691
Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
661692
Sumit Semwal <sumit.semwal@ti.com>
662693
Surabhi Vishnoi <quic_svishnoi@quicinc.com> <svishnoi@codeaurora.org>
694+
Sven Eckelmann <sven@narfation.org> <seckelmann@datto.com>
695+
Sven Eckelmann <sven@narfation.org> <sven.eckelmann@gmx.de>
696+
Sven Eckelmann <sven@narfation.org> <sven.eckelmann@open-mesh.com>
697+
Sven Eckelmann <sven@narfation.org> <sven.eckelmann@openmesh.com>
698+
Sven Eckelmann <sven@narfation.org> <sven@open-mesh.com>
663699
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
664700
Tamizh Chelvam Raja <quic_tamizhr@quicinc.com> <tamizhr@codeaurora.org>
665701
Taniya Das <quic_tdas@quicinc.com> <tdas@codeaurora.org>
@@ -735,6 +771,8 @@ Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de>
735771
Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
736772
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
737773
Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
774+
Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>
775+
Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>
738776
Yusuke Goda <goda.yusuke@renesas.com>
739777
Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>
740778
Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>

CREDITS

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ N: Thomas Abraham
2020
E: thomas.ab@samsung.com
2121
D: Samsung pin controller driver
2222

23+
N: Jose Abreu
24+
E: jose.abreu@synopsys.com
25+
D: Synopsys DesignWare XPCS MDIO/PCS driver.
26+
2327
N: Dragos Acostachioaie
2428
E: dragos@iname.com
2529
W: http://www.arbornet.org/~dragos
@@ -1428,6 +1432,10 @@ S: 8124 Constitution Apt. 7
14281432
S: Sterling Heights, Michigan 48313
14291433
S: USA
14301434

1435+
N: Andy Gospodarek
1436+
E: andy@greyhouse.net
1437+
D: Maintenance and contributions to the network interface bonding driver.
1438+
14311439
N: Wolfgang Grandegger
14321440
E: wg@grandegger.com
14331441
D: Controller Area Network (device drivers)
@@ -1812,6 +1820,10 @@ D: Author/maintainer of most DRM drivers (especially ATI, MGA)
18121820
D: Core DRM templates, general DRM and 3D-related hacking
18131821
S: No fixed address
18141822

1823+
N: Woojung Huh
1824+
E: woojung.huh@microchip.com
1825+
D: Microchip LAN78XX USB Ethernet driver
1826+
18151827
N: Kenn Humborg
18161828
E: kenn@wombat.ie
18171829
D: Mods to loop device to support sparse backing files
@@ -2503,11 +2515,9 @@ D: SLS distribution
25032515
D: Initial implementation of VC's, pty's and select()
25042516

25052517
N: Pavel Machek
2506-
E: pavel@ucw.cz
2518+
E: pavel@kernel.org
25072519
P: 4096R/92DFCE96 4FA7 9EEF FCD4 C44F C585 B8C7 C060 2241 92DF CE96
2508-
D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd,
2509-
D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,
2510-
D: work on suspend-to-ram/disk, killing duplicates from ioctl32,
2520+
D: NBD, Sun4/330 port, USB, work on suspend-to-ram/disk,
25112521
D: Altera SoCFPGA and Nokia N900 support.
25122522
S: Czech Republic
25132523

@@ -4327,7 +4337,7 @@ D: Freescale Highspeed USB device driver
43274337
D: Freescale QE SoC support and Ethernet driver
43284338
S: B-1206 Jingmao Guojigongyu
43294339
S: 16 Baliqiao Nanjie, Beijing 101100
4330-
S: People's Repulic of China
4340+
S: People's Republic of China
43314341

43324342
N: Vlad Yasevich
43334343
E: vyasevich@gmail.com

Documentation/ABI/testing/sysfs-class-cxl renamed to Documentation/ABI/obsolete/sysfs-class-cxl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
The cxl driver is no longer maintained, and will be removed from the kernel in
2+
the near future.
3+
14
Please note that attributes that are shared between devices are stored in
25
the directory pointed to by the symlink device/.
36
For example, the real path of the attribute /sys/class/cxl/afu0.0s/irqs_max is
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
What: /sys/class/bluetooth/hci<index>/reset
2+
Date: 14-Jan-2025
3+
KernelVersion: 6.13
4+
Contact: linux-bluetooth@vger.kernel.org
5+
Description: This write-only attribute allows users to trigger the vendor reset
6+
method on the Bluetooth device when arbitrary data is written.
7+
The reset may or may not be done through the device transport
8+
(e.g., UART/USB), and can also be done through an out-of-band
9+
approach such as GPIO.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
What: /sys/bus/coresight/devices/dummy_source<N>/enable_source
2+
Date: Dec 2024
3+
KernelVersion: 6.14
4+
Contact: Mao Jinlong <quic_jinlmao@quicinc.com>
5+
Description: (RW) Enable/disable tracing of dummy source. A sink should be activated
6+
before enabling the source. The path of coresight components linking
7+
the source to the sink is configured and managed automatically by the
8+
coresight framework.
9+
10+
What: /sys/bus/coresight/devices/dummy_source<N>/traceid
11+
Date: Dec 2024
12+
KernelVersion: 6.14
13+
Contact: Mao Jinlong <quic_jinlmao@quicinc.com>
14+
Description: (R) Show the trace ID that will appear in the trace stream
15+
coming from this trace entity.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
What: /sys/bus/event_source/devices/<pmu>
2+
Date: 2014/02/24
3+
Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org>
4+
Description: Performance Monitoring Unit (<pmu>)
5+
6+
Each <pmu> directory, for a PMU device, is a name
7+
optionally followed by an underscore and then either a
8+
decimal or hexadecimal number. For example, cpu is a
9+
PMU name without a suffix as is intel_bts,
10+
uncore_imc_0 is a PMU name with a 0 numeric suffix,
11+
ddr_pmu_87e1b0000000 is a PMU name with a hex
12+
suffix. The hex suffix must be more than two
13+
characters long to avoid ambiguity with PMUs like the
14+
S390 cpum_cf.
15+
16+
Tools can treat PMUs with the same name that differ by
17+
suffix as instances of the same PMU for the sake of,
18+
for example, opening an event. For example, the PMUs
19+
uncore_imc_free_running_0 and
20+
uncore_imc_free_running_1 have an event data_read;
21+
opening the data_read event on a PMU specified as
22+
uncore_imc_free_running should be treated as opening
23+
the data_read event on PMU uncore_imc_free_running_0
24+
and PMU uncore_imc_free_running_1.

Documentation/ABI/testing/sysfs-bus-event_source-devices-events

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,13 @@ Description: Per-pmu performance monitoring events specific to the running syste
3737
performance monitoring event supported by the <pmu>. The name
3838
of the file is the name of the event.
3939

40-
As performance monitoring event names are case
41-
insensitive in the perf tool, the perf tool only looks
42-
for lower or upper case event names in sysfs to avoid
40+
As performance monitoring event names are case insensitive
41+
in the perf tool, the perf tool only looks for all lower
42+
case or all upper case event names in sysfs to avoid
4343
scanning the directory. It is therefore required the
44-
name of the event here is either lower or upper case.
44+
name of the event here is either completely lower or upper
45+
case, with no mixed-case characters. Numbers, '.', '_', and
46+
'-' are also allowed.
4547

4648
File contents:
4749

0 commit comments

Comments
 (0)