Skip to content

Commit 0b11904

Browse files
committed
Merge tag 'v6.14-rc4' into next
Sync up with the mainline.
2 parents 7f7573b + d082ecb commit 0b11904

File tree

9,992 files changed

+444019
-147853
lines changed

Some content is hidden

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

9,992 files changed

+444019
-147853
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 <[email protected]> <[email protected]>
8383
8484
8585
86+
87+
88+
89+
90+
91+
92+
8693
8794
Archit Taneja <[email protected]>
8895
@@ -121,6 +128,8 @@ Ben Widawsky <[email protected]> <[email protected]>
121128
122129
Benjamin Tissoires <[email protected]> <[email protected]>
123130
Benjamin Tissoires <[email protected]> <[email protected]>
131+
132+
124133
125134
126135
@@ -133,13 +142,17 @@ Boris Brezillon <[email protected]> <[email protected]>
133142
134143
135144
Brian Avery <[email protected]>
145+
146+
136147
Brian King <[email protected]>
137148
138149
139150
140151
141152
142-
153+
154+
155+
143156
144157
145158
@@ -156,6 +169,7 @@ Christian Brauner <[email protected]> <[email protected]>
156169
157170
Christian Marangi <[email protected]>
158171
Christophe Ricard <[email protected]>
172+
Christopher Obbard <[email protected]> <[email protected]>
159173
Christoph Hellwig <[email protected]>
160174
161175
@@ -200,6 +214,7 @@ Elliot Berman <[email protected]> <[email protected]>
200214
Enric Balletbo i Serra <[email protected]> <[email protected]>
201215
Enric Balletbo i Serra <[email protected]> <[email protected]>
202216
217+
Ethan Carter Edwards <[email protected]> Ethan Edwards <[email protected]>
203218
204219
205220
Evgeniy Polyakov <[email protected]>
@@ -211,6 +226,7 @@ Fangrui Song <[email protected]> <[email protected]>
211226
Felipe W Damasio <[email protected]>
212227
Felix Kuhling <[email protected]>
213228
Felix Moeller <[email protected]>
229+
214230
215231
Filipe Lautert <[email protected]>
216232
@@ -251,6 +267,7 @@ Guo Ren <[email protected]> <[email protected]>
251267
Guru Das Srinagesh <[email protected]> <[email protected]>
252268
Gustavo Padovan <[email protected]>
253269
Gustavo Padovan <[email protected]>
270+
254271
255272
256273
@@ -301,6 +318,8 @@ Jayachandran C <[email protected]> <[email protected]>
301318
Jean Tourrilhes <[email protected]>
302319
303320
Jeff Garzik <[email protected]>
321+
322+
304323
305324
306325
@@ -360,6 +379,7 @@ Juha Yrjola <[email protected]>
360379
361380
362381
382+
363383
364384
Karthikeyan Periyasamy <[email protected]> <[email protected]>
365385
@@ -405,6 +425,7 @@ Liam Mark <[email protected]> <[email protected]>
405425
Linas Vepstas <[email protected]>
406426
407427
428+
408429
409430
410431
@@ -427,6 +448,8 @@ Marcin Nowakowski <[email protected]> <[email protected]>
427448
428449
429450
Marek Behún <[email protected]> Marek Behun <[email protected]>
451+
452+
430453
Mark Brown <[email protected]>
431454
432455
Markus Schneider-Pargmann <[email protected]> <[email protected]>
@@ -435,7 +458,7 @@ Martin Kepplinger <[email protected]> <[email protected]>
435458
436459
437460
Martyna Szapar-Mudlaw <[email protected]> <[email protected]>
438-
Mathieu Othacehe <m.othacehe@gmail.com> <othacehe@gnu.org>
461+
Mathieu Othacehe <othacehe@gnu.org> <m.othacehe@gmail.com>
439462
440463
441464
@@ -511,6 +534,7 @@ Nicholas Piggin <[email protected]> <[email protected]>
511534
512535
513536
537+
514538
515539
516540
@@ -529,6 +553,8 @@ Oleksij Rempel <[email protected]> <[email protected]>
529553
530554
Oleksij Rempel <[email protected]>
531555
556+
557+
532558
533559
534560
@@ -640,6 +666,11 @@ Simona Vetter <[email protected]> <[email protected]>
640666
641667
642668
Simon Kelley <[email protected]>
669+
670+
671+
672+
673+
643674
Sricharan Ramabadhran <[email protected]> <[email protected]>
644675
645676
@@ -660,6 +691,11 @@ Sudarshan Rajagopalan <[email protected]> <[email protected]>
660691
Sudeep Holla <[email protected]> Sudeep KarkadaNagesha <[email protected]>
661692
Sumit Semwal <[email protected]>
662693
694+
695+
696+
697+
698+
663699
Takashi YOSHII <[email protected]>
664700
Tamizh Chelvam Raja <[email protected]> <[email protected]>
665701
@@ -735,6 +771,8 @@ Wolfram Sang <[email protected]> <[email protected]>
735771
736772
737773
774+
775+
738776
Yusuke Goda <[email protected]>
739777
740778

CREDITS

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

23+
N: Jose Abreu
24+
25+
D: Synopsys DesignWare XPCS MDIO/PCS driver.
26+
2327
N: Dragos Acostachioaie
2428
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+
1437+
D: Maintenance and contributions to the network interface bonding driver.
1438+
14311439
N: Wolfgang Grandegger
14321440
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+
1825+
D: Microchip LAN78XX USB Ethernet driver
1826+
18151827
N: Kenn Humborg
18161828
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

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+
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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)