Skip to content

Commit ac4890f

Browse files
committed
Merge branch 'for-6.5/core' into for-next
2 parents 5e36be5 + 42cffe9 commit ac4890f

File tree

16,555 files changed

+987485
-556282
lines changed

Some content is hidden

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

16,555 files changed

+987485
-556282
lines changed

.clang-format

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ ForEachMacros:
190190
- 'for_each_active_dev_scope'
191191
- 'for_each_active_drhd_unit'
192192
- 'for_each_active_iommu'
193+
- 'for_each_active_route'
193194
- 'for_each_aggr_pgid'
194195
- 'for_each_available_child_of_node'
195196
- 'for_each_bench'
@@ -225,7 +226,6 @@ ForEachMacros:
225226
- 'for_each_console_srcu'
226227
- 'for_each_cpu'
227228
- 'for_each_cpu_and'
228-
- 'for_each_cpu_not'
229229
- 'for_each_cpu_wrap'
230230
- 'for_each_dapm_widgets'
231231
- 'for_each_dedup_cand'
@@ -520,7 +520,7 @@ ForEachMacros:
520520
- 'of_property_for_each_string'
521521
- 'of_property_for_each_u32'
522522
- 'pci_bus_for_each_resource'
523-
- 'pci_doe_for_each_off'
523+
- 'pci_dev_for_each_resource'
524524
- 'pcl_for_each_chunk'
525525
- 'pcl_for_each_segment'
526526
- 'pcm_for_each_format'

.gitattributes

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*.c diff=cpp
2-
*.h diff=cpp
3-
*.dtsi diff=dts
4-
*.dts diff=dts
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
*.[ch] diff=cpp
3+
*.dts diff=dts
4+
*.dts[io] diff=dts

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# subdirectories here. Add them in the ".gitignore" file
55
# in that subdirectory instead.
66
#
7-
# NOTE! Please use 'git ls-files -i --exclude-standard'
7+
# NOTE! Please use 'git ls-files -i -c --exclude-per-directory=.gitignore'
88
# command after changing this file, to see if there are
99
# any tracked files which get ignored after the change.
1010
#
@@ -16,6 +16,7 @@
1616
*.bin
1717
*.bz2
1818
*.c.[012]*.*
19+
*.cover
1920
*.dt.yaml
2021
*.dtb
2122
*.dtbo
@@ -33,6 +34,7 @@
3334
*.lz4
3435
*.lzma
3536
*.lzo
37+
*.mbx
3638
*.mod
3739
*.mod.c
3840
*.o
@@ -76,6 +78,7 @@ modules.order
7678
# RPM spec file (make rpm-pkg)
7779
#
7880
/*.spec
81+
/rpmbuild/
7982

8083
#
8184
# Debian directory (make deb-pkg)
@@ -100,6 +103,7 @@ modules.order
100103
!.get_maintainer.ignore
101104
!.gitattributes
102105
!.gitignore
106+
!.kunitconfig
103107
!.mailmap
104108
!.rustfmt.toml
105109

.mailmap

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Alexander Lobakin <[email protected]> <[email protected]>
2828
Alexander Mikhalitsyn <[email protected]> <[email protected]>
2929
Alexander Mikhalitsyn <[email protected]> <[email protected]>
3030
31+
3132
Alexei Starovoitov <[email protected]> <[email protected]>
3233
Alexei Starovoitov <[email protected]> <[email protected]>
3334
Alexei Starovoitov <[email protected]> <[email protected]>
@@ -121,6 +122,7 @@ Dengcheng Zhu <[email protected]> <[email protected]>
121122
122123
123124
125+
124126
Dmitry Baryshkov <[email protected]>
125127
Dmitry Baryshkov <[email protected]> <[[email protected]]>
126128
@@ -131,10 +133,15 @@ Dmitry Safonov <[email protected]> <[email protected]>
131133
Domen Puncer <[email protected]>
132134
Douglas Gilbert <[email protected]>
133135
Ed L. Cashin <[email protected]>
136+
Enric Balletbo i Serra <[email protected]> <[email protected]>
137+
Enric Balletbo i Serra <[email protected]> <[email protected]>
134138
135139
136140
Evgeniy Polyakov <[email protected]>
137141
142+
143+
144+
138145
Felipe W Damasio <[email protected]>
139146
Felix Kuhling <[email protected]>
140147
Felix Moeller <[email protected]>
@@ -150,6 +157,7 @@ Gao Xiang <[email protected]> <[email protected]>
150157
151158
152159
160+
153161
154162
155163
@@ -189,6 +197,7 @@ Jan Glauber <[email protected]> <[email protected]>
189197
190198
191199
200+
192201
193202
194203
@@ -204,10 +213,16 @@ Jeff Garzik <[email protected]>
204213
205214
206215
207-
Jens Axboe <[email protected]>
216+
217+
218+
219+
208220
Jens Osterkamp <[email protected]>
209221
210222
223+
224+
225+
211226
212227
213228
@@ -220,6 +235,8 @@ Johan Hovold <[email protected]> <[email protected]>
220235
221236
John Paul Adrian Glaubitz <[email protected]>
222237
John Stultz <[email protected]>
238+
239+
223240
224241
225242
@@ -253,7 +270,9 @@ Krzysztof Kozlowski <[email protected]> <[email protected]>
253270
Krzysztof Kozlowski <[email protected]> <[email protected]>
254271
Kuninori Morimoto <[email protected]>
255272
273+
Leonard Crestez <[email protected]> Leonard Crestez <[email protected]>
256274
275+
Leonard Göhrs <[email protected]>
257276
Leonid I Ananiev <[email protected]>
258277
259278
@@ -283,6 +302,8 @@ Martin Kepplinger <[email protected]> <[email protected]>
283302
284303
Martyna Szapar-Mudlaw <[email protected]> <[email protected]>
285304
Mathieu Othacehe <[email protected]>
305+
306+
286307
287308
288309
@@ -304,10 +325,13 @@ Mauro Carvalho Chehab <[email protected]> <[email protected]>
304325
Mauro Carvalho Chehab <[email protected]> <[email protected]>
305326
Mauro Carvalho Chehab <[email protected]> <[email protected]>
306327
Mauro Carvalho Chehab <[email protected]> <[email protected]>
328+
Maxim Mikityanskiy <[email protected]> <[email protected]>
329+
Maxim Mikityanskiy <[email protected]> <[email protected]>
307330
308331
309332
Mayuresh Janorkar <[email protected]>
310333
Michael Buesch <[email protected]>
334+
311335
Michel Dänzer <[email protected]>
312336
Michel Lespinasse <[email protected]>
313337
@@ -340,6 +364,7 @@ Nicolas Pitre <[email protected]> <[email protected]>
340364
Nicolas Saenz Julienne <[email protected]> <[email protected]>
341365
Nicolas Saenz Julienne <[email protected]> <[email protected]>
342366
Niklas Söderlund <[email protected]>
367+
Oleksandr Natalenko <[email protected]> <[email protected]>
343368
344369
345370
@@ -355,6 +380,8 @@ Paul E. McKenney <[email protected]> <[email protected]>
355380
356381
357382
383+
384+
358385
Peter A Jonsson <[email protected]>
359386
Peter Oruba <[email protected]>
360387
Peter Oruba <[email protected]>
@@ -367,6 +394,7 @@ Quentin Monnet <[email protected]> <[email protected]>
367394
368395
369396
397+
370398
Rajesh Shah <[email protected]>
371399
Ralf Baechle <[email protected]>
372400
Ralf Wildenhues <[email protected]>
@@ -375,6 +403,9 @@ Rémi Denis-Courmont <[email protected]>
375403
376404
Ricardo Ribalda <[email protected]> Ricardo Ribalda Delgado <[email protected]>
377405
406+
407+
408+
378409
379410
380411
@@ -385,6 +416,7 @@ Ross Zwisler <[email protected]> <[email protected]>
385416
Rudolf Marek <[email protected]>
386417
Rui Saraiva <[email protected]>
387418
Sachin P Sant <[email protected]>
419+
Sai Prakash Ranjan <[email protected]> <[email protected]>
388420
389421
Sam Ravnborg <[email protected]>
390422
Sankeerth Billakanti <[email protected]> <[email protected]>
@@ -409,7 +441,10 @@ Shuah Khan <[email protected]> <[email protected]>
409441
410442
Simon Kelley <[email protected]>
411443
Stéphane Witzmann <[email protected]>
412-
Stephen Hemminger <[email protected]>
444+
445+
446+
447+
413448
414449
415450
Subash Abhinov Kasiviswanathan <[email protected]>
@@ -422,6 +457,10 @@ Thomas Graf <[email protected]>
422457
423458
Thomas Pedersen <[email protected]>
424459
460+
461+
462+
463+
425464
426465
Tony Luck <[email protected]>
427466
@@ -441,6 +480,7 @@ Vasily Averin <[email protected]> <[email protected]>
441480
442481
443482
Valentin Schneider <[email protected]> <[email protected]>
483+
444484
445485
446486

CREDITS

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,10 @@ S: University of Notre Dame
229229
S: Notre Dame, Indiana
230230
S: USA
231231

232+
N: Kai Bankett
233+
234+
D: QNX6 filesystem
235+
232236
N: Greg Banks
233237
234238
D: IDT77105 ATM network driver
@@ -886,6 +890,10 @@ W: http://jdelvare.nerim.net/
886890
D: Several hardware monitoring drivers
887891
S: France
888892

893+
N: Frank "Jedi/Sector One" Denis
894+
895+
D: QNX4 filesystem
896+
889897
N: Peter Denison
890898
891899
W: http://www.pnd-pc.demon.co.uk/promise/
@@ -1259,6 +1267,10 @@ S: USA
12591267
N: Adam Fritzler
12601268
12611269

1270+
N: Richard "Scuba" A. Frowijn
1271+
1272+
D: QNX4 filesystem
1273+
12621274
N: Fernando Fuganti
12631275
12641276
@@ -1852,11 +1864,11 @@ E: [email protected]
18521864
D: fbdev hacking
18531865

18541866
N: Jesper Juhl
1855-
1867+
18561868
D: Various fixes, cleanups and minor features all over the tree.
18571869
D: Wrote initial version of the hdaps driver (since passed on to others).
1858-
S: Lemnosvej 1, 3.tv
1859-
S: 2300 Copenhagen S.
1870+
S: Titangade 5G, 2.tv
1871+
S: 2200 Copenhagen N.
18601872
S: Denmark
18611873

18621874
N: Jozsef Kadlecsik
@@ -2218,6 +2230,10 @@ D: Digiboard PC/Xe and PC/Xi, Digiboard EPCA
22182230
D: NUMA support, Slab allocators, Page migration
22192231
D: Scalability, Time subsystem
22202232

2233+
N: Anders Larsen
2234+
2235+
D: QNX4 filesystem
2236+
22212237
N: Paul Laufer
22222238
22232239
D: Soundblaster driver fixes, ISAPnP quirk
@@ -2494,8 +2510,8 @@ D: XF86_8514
24942510
D: cfdisk (curses based disk partitioning program)
24952511

24962512
N: Mat Martineau
2497-
E: mat@martineau.name
2498-
D: MPTCP subsystem co-maintainer 2020-2023
2513+
E: martineau@kernel.org
2514+
D: MPTCP subsystem co-maintainer
24992515
D: Keyctl restricted keyring and Diffie-Hellman UAPI
25002516
D: Bluetooth L2CAP ERTM mode and AMP
25012517
S: USA
@@ -3459,6 +3475,11 @@ D: several improvements to system programs
34593475
S: Oldenburg
34603476
S: Germany
34613477

3478+
N: Mathieu Poirier
3479+
3480+
D: CoreSight kernel subsystem, Maintainer 2014-2022
3481+
D: Perf tool support for CoreSight
3482+
34623483
N: Robert Schwebel
34633484
34643485
W: https://www.schwebel.de

Documentation/ABI/obsolete/sysfs-selinux-checkreqprot renamed to Documentation/ABI/removed/sysfs-selinux-checkreqprot

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ KernelVersion: 2.6.12-rc2 (predates git)
44
55
Description:
66

7+
REMOVAL UPDATE: The SELinux checkreqprot functionality was removed in
8+
March 2023, the original deprecation notice is shown below.
9+
710
The selinuxfs "checkreqprot" node allows SELinux to be configured
811
to check the protection requested by userspace for mmap/mprotect
912
calls instead of the actual protection applied by the kernel.

Documentation/ABI/obsolete/sysfs-selinux-disable renamed to Documentation/ABI/removed/sysfs-selinux-disable

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ KernelVersion: 2.6.12-rc2 (predates git)
44
55
Description:
66

7+
REMOVAL UPDATE: The SELinux runtime disable functionality was removed
8+
in March 2023, the original deprecation notice is shown below.
9+
710
The selinuxfs "disable" node allows SELinux to be disabled at runtime
811
prior to a policy being loaded into the kernel. If disabled via this
912
mechanism, SELinux will remain disabled until the system is rebooted.

Documentation/ABI/stable/sysfs-acpi-pmprofile

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@ What: /sys/firmware/acpi/pm_profile
22
Date: 03-Nov-2011
33
KernelVersion: v3.2
44
5-
Description: The ACPI pm_profile sysfs interface exports the platform
6-
power management (and performance) requirement expectations
7-
as provided by BIOS. The integer value is directly passed as
8-
retrieved from the FADT ACPI table.
5+
Description: The ACPI pm_profile sysfs interface exposes the preferred
6+
power management (and performance) profile of the platform
7+
as provided in the ACPI FADT Preferred_PM_Profile field.
98

10-
Values: For possible values see ACPI specification:
11-
5.2.9 Fixed ACPI Description Table (FADT)
12-
Field: Preferred_PM_Profile
9+
The integer value is directly passed as retrieved from the FADT.
1310

14-
Currently these values are defined by spec:
11+
Values: For the possible values refer to the Preferred_PM_Profile field
12+
definition in Table 5.9 "FADT Format", Section 5.2.9 "Fixed ACPI
13+
Description Table (FADT)" of the ACPI specification.
14+
15+
As of ACPI 6.5, the following values are defined:
1516

1617
== =================
1718
0 Unspecified
@@ -22,5 +23,6 @@ Values: For possible values see ACPI specification:
2223
5 SOHO Server
2324
6 Appliance PC
2425
7 Performance Server
25-
>7 Reserved
26+
8 Tablet
27+
>8 Reserved
2628
== =================

0 commit comments

Comments
 (0)