Skip to content

Commit 1ac731c

Browse files
committed
Merge branch 'next' into for-linus
Prepare input updates for 6.6 merge window.
2 parents 07b4c95 + 54116d4 commit 1ac731c

File tree

14,512 files changed

+871992
-453797
lines changed

Some content is hidden

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

14,512 files changed

+871992
-453797
lines changed

.clang-format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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'

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ modules.order
7878
# RPM spec file (make rpm-pkg)
7979
#
8080
/*.spec
81+
/rpmbuild/
8182

8283
#
8384
# Debian directory (make deb-pkg)
@@ -102,6 +103,7 @@ modules.order
102103
!.get_maintainer.ignore
103104
!.gitattributes
104105
!.gitignore
106+
!.kunitconfig
105107
!.mailmap
106108
!.rustfmt.toml
107109

.mailmap

Lines changed: 39 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]>
@@ -69,6 +70,8 @@ Baolin Wang <[email protected]> <[email protected]>
6970
7071
7172
73+
74+
7275
Ben Gardner <[email protected]>
7376
Ben M Cahill <[email protected]>
7477
@@ -121,7 +124,7 @@ Dengcheng Zhu <[email protected]> <[email protected]>
121124
122125
123126
124-
Dikshita Agarwal <[email protected].com> <[email protected]>
127+
Dikshita Agarwal <quic_dikshita@quicinc.com> <[email protected]>
125128
Dmitry Baryshkov <[email protected]>
126129
Dmitry Baryshkov <[email protected]> <[[email protected]]>
127130
@@ -132,6 +135,8 @@ Dmitry Safonov <[email protected]> <[email protected]>
132135
Domen Puncer <[email protected]>
133136
Douglas Gilbert <[email protected]>
134137
Ed L. Cashin <[email protected]>
138+
Enric Balletbo i Serra <[email protected]> <[email protected]>
139+
Enric Balletbo i Serra <[email protected]> <[email protected]>
135140
136141
137142
Evgeniy Polyakov <[email protected]>
@@ -194,6 +199,7 @@ Jan Glauber <[email protected]> <[email protected]>
194199
195200
196201
202+
197203
198204
199205
@@ -209,10 +215,16 @@ Jeff Garzik <[email protected]>
209215
210216
211217
212-
Jens Axboe <[email protected]>
218+
219+
220+
221+
213222
Jens Osterkamp <[email protected]>
214223
215224
225+
226+
227+
216228
217229
218230
@@ -223,8 +235,11 @@ Jisheng Zhang <[email protected]> <[email protected]>
223235
224236
225237
238+
226239
John Paul Adrian Glaubitz <[email protected]>
227240
John Stultz <[email protected]>
241+
242+
228243
229244
230245
@@ -258,7 +273,9 @@ Krzysztof Kozlowski <[email protected]> <[email protected]>
258273
Krzysztof Kozlowski <[email protected]> <[email protected]>
259274
Kuninori Morimoto <[email protected]>
260275
276+
Leonard Crestez <[email protected]> Leonard Crestez <[email protected]>
261277
278+
Leonard Göhrs <[email protected]>
262279
Leonid I Ananiev <[email protected]>
263280
264281
@@ -288,6 +305,8 @@ Martin Kepplinger <[email protected]> <[email protected]>
288305
289306
Martyna Szapar-Mudlaw <[email protected]> <[email protected]>
290307
Mathieu Othacehe <[email protected]>
308+
309+
291310
292311
293312
@@ -315,6 +334,7 @@ Maxime Ripard <[email protected]> <[email protected]>
315334
316335
Mayuresh Janorkar <[email protected]>
317336
Michael Buesch <[email protected]>
337+
318338
Michel Dänzer <[email protected]>
319339
Michel Lespinasse <[email protected]>
320340
@@ -347,6 +367,12 @@ Nicolas Pitre <[email protected]> <[email protected]>
347367
Nicolas Saenz Julienne <[email protected]> <[email protected]>
348368
Nicolas Saenz Julienne <[email protected]> <[email protected]>
349369
Niklas Söderlund <[email protected]>
370+
Nikolay Aleksandrov <[email protected]> <[email protected]>
371+
Nikolay Aleksandrov <[email protected]> <[email protected]>
372+
Nikolay Aleksandrov <[email protected]> <[email protected]>
373+
Nikolay Aleksandrov <[email protected]> <[email protected]>
374+
Nikolay Aleksandrov <[email protected]> <[email protected]>
375+
Oleksandr Natalenko <[email protected]> <[email protected]>
350376
351377
352378
@@ -362,6 +388,8 @@ Paul E. McKenney <[email protected]> <[email protected]>
362388
363389
364390
391+
392+
365393
Peter A Jonsson <[email protected]>
366394
Peter Oruba <[email protected]>
367395
Peter Oruba <[email protected]>
@@ -374,6 +402,7 @@ Quentin Monnet <[email protected]> <[email protected]>
374402
375403
376404
405+
377406
Rajesh Shah <[email protected]>
378407
Ralf Baechle <[email protected]>
379408
Ralf Wildenhues <[email protected]>
@@ -382,6 +411,9 @@ Rémi Denis-Courmont <[email protected]>
382411
383412
Ricardo Ribalda <[email protected]> Ricardo Ribalda Delgado <[email protected]>
384413
414+
415+
416+
385417
386418
387419
@@ -392,6 +424,7 @@ Ross Zwisler <[email protected]> <[email protected]>
392424
Rudolf Marek <[email protected]>
393425
Rui Saraiva <[email protected]>
394426
Sachin P Sant <[email protected]>
427+
Sai Prakash Ranjan <[email protected]> <[email protected]>
395428
396429
Sam Ravnborg <[email protected]>
397430
Sankeerth Billakanti <[email protected]> <[email protected]>
@@ -432,6 +465,10 @@ Thomas Graf <[email protected]>
432465
433466
Thomas Pedersen <[email protected]>
434467
468+
469+
470+
471+
435472
436473
Tony Luck <[email protected]>
437474

CREDITS

Lines changed: 27 additions & 2 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
@@ -1694,6 +1706,10 @@ S: Panoramastrasse 18
16941706
S: D-69126 Heidelberg
16951707
S: Germany
16961708

1709+
N: Neil Horman
1710+
1711+
D: SCTP protocol maintainer.
1712+
16971713
N: Simon Horman
16981714
16991715
D: Renesas ARM/ARM64 SoC maintainer
@@ -2218,6 +2234,10 @@ D: Digiboard PC/Xe and PC/Xi, Digiboard EPCA
22182234
D: NUMA support, Slab allocators, Page migration
22192235
D: Scalability, Time subsystem
22202236

2237+
N: Anders Larsen
2238+
2239+
D: QNX4 filesystem
2240+
22212241
N: Paul Laufer
22222242
22232243
D: Soundblaster driver fixes, ISAPnP quirk
@@ -2494,8 +2514,8 @@ D: XF86_8514
24942514
D: cfdisk (curses based disk partitioning program)
24952515

24962516
N: Mat Martineau
2497-
E: mat@martineau.name
2498-
D: MPTCP subsystem co-maintainer 2020-2023
2517+
E: martineau@kernel.org
2518+
D: MPTCP subsystem co-maintainer
24992519
D: Keyctl restricted keyring and Diffie-Hellman UAPI
25002520
D: Bluetooth L2CAP ERTM mode and AMP
25012521
S: USA
@@ -3459,6 +3479,11 @@ D: several improvements to system programs
34593479
S: Oldenburg
34603480
S: Germany
34613481

3482+
N: Mathieu Poirier
3483+
3484+
D: CoreSight kernel subsystem, Maintainer 2014-2022
3485+
D: Perf tool support for CoreSight
3486+
34623487
N: Robert Schwebel
34633488
34643489
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
== =================

Documentation/ABI/stable/sysfs-block

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -336,18 +336,11 @@ What: /sys/block/<disk>/queue/io_poll_delay
336336
Date: November 2016
337337
338338
Description:
339-
[RW] If polling is enabled, this controls what kind of polling
340-
will be performed. It defaults to -1, which is classic polling.
339+
[RW] This was used to control what kind of polling will be
340+
performed. It is now fixed to -1, which is classic polling.
341341
In this mode, the CPU will repeatedly ask for completions
342-
without giving up any time. If set to 0, a hybrid polling mode
343-
is used, where the kernel will attempt to make an educated guess
344-
at when the IO will complete. Based on this guess, the kernel
345-
will put the process issuing IO to sleep for an amount of time,
346-
before entering a classic poll loop. This mode might be a little
347-
slower than pure classic polling, but it will be more efficient.
348-
If set to a value larger than 0, the kernel will put the process
349-
issuing IO to sleep for this amount of microseconds before
350-
entering classic polling.
342+
without giving up any time.
343+
<deprecated>
351344

352345

353346
What: /sys/block/<disk>/queue/io_timeout

0 commit comments

Comments
 (0)