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 <alobakin@pm.me> <bloodyreaper@yandex.ru>
2828
Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>
2929
Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>
3030
Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electrons.com>
31+
Alexandre Ghiti <alex@ghiti.fr> <alexandre.ghiti@canonical.com>
3132
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
3233
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
3334
Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
@@ -69,6 +70,8 @@ Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@unisoc.com>
6970
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang7@gmail.com>
7071
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
7172
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
73+
Ben Dooks <ben-linux@fluff.org> <ben.dooks@simtec.co.uk>
74+
Ben Dooks <ben-linux@fluff.org> <ben.dooks@sifive.com>
7275
Ben Gardner <bgardner@wabtec.com>
7376
Ben M Cahill <ben.m.cahill@intel.com>
7477
Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>
@@ -121,7 +124,7 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
121124
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
122125
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
123126
<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
124-
Dikshita Agarwal <dikshita@qti.qualcomm.com> <dikshita@codeaurora.org>
127+
Dikshita Agarwal <quic_dikshita@quicinc.com> <dikshita@codeaurora.org>
125128
Dmitry Baryshkov <dbaryshkov@gmail.com>
126129
Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>
127130
Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>
@@ -132,6 +135,8 @@ Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
132135
Domen Puncer <domen@coderock.org>
133136
Douglas Gilbert <dougg@torque.net>
134137
Ed L. Cashin <ecashin@coraid.com>
138+
Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>
139+
Enric Balletbo i Serra <eballetbo@kernel.org> <eballetbo@iseebcn.com>
135140
Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
136141
Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>
137142
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
@@ -194,6 +199,7 @@ Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>
194199
Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
195200
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>
196201
Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>
202+
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@tuni.fi>
197203
Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
198204
Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>
199205
Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
@@ -209,10 +215,16 @@ Jeff Garzik <jgarzik@pretzel.yyz.us>
209215
Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>
210216
Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com>
211217
Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>
212-
Jens Axboe <axboe@suse.de>
218+
Jens Axboe <axboe@kernel.dk> <axboe@suse.de>
219+
Jens Axboe <axboe@kernel.dk> <jens.axboe@oracle.com>
220+
Jens Axboe <axboe@kernel.dk> <axboe@fb.com>
221+
Jens Axboe <axboe@kernel.dk> <axboe@meta.com>
213222
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
214223
Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
215224
Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
225+
Jiri Pirko <jiri@resnulli.us> <jiri@nvidia.com>
226+
Jiri Pirko <jiri@resnulli.us> <jiri@mellanox.com>
227+
Jiri Pirko <jiri@resnulli.us> <jpirko@redhat.com>
216228
Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>
217229
Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>
218230
Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
@@ -223,8 +235,11 @@ Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>
223235
Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
224236
Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
225237
John Crispin <john@phrozen.org> <blogic@openwrt.org>
238+
John Keeping <john@keeping.me.uk> <john@metanate.com>
226239
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
227240
John Stultz <johnstul@us.ibm.com>
241+
<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>
242+
<jon.toppins+linux@gmail.com> <jtoppins@redhat.com>
228243
Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>
229244
<josh@joshtriplett.org> <josh@freedesktop.org>
230245
<josh@joshtriplett.org> <josh@kernel.org>
@@ -258,7 +273,9 @@ Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
258273
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>
259274
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
260275
Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>
276+
Leonard Crestez <leonard.crestez@nxp.com> Leonard Crestez <cdleonard@gmail.com>
261277
Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>
278+
Leonard Göhrs <l.goehrs@pengutronix.de>
262279
Leonid I Ananiev <leonid.i.ananiev@intel.com>
263280
Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
264281
Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>
@@ -288,6 +305,8 @@ Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>
288305
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
289306
Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com> <martyna.szapar-mudlaw@intel.com>
290307
Mathieu Othacehe <m.othacehe@gmail.com>
308+
Mat Martineau <martineau@kernel.org> <mathew.j.martineau@linux.intel.com>
309+
Mat Martineau <martineau@kernel.org> <mathewm@codeaurora.org>
291310
Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>
292311
Matthew Wilcox <willy@infradead.org> <matthew@wil.cx>
293312
Matthew Wilcox <willy@infradead.org> <mawilcox@linuxonhyperv.com>
@@ -315,6 +334,7 @@ Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>
315334
Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
316335
Mayuresh Janorkar <mayur@ti.com>
317336
Michael Buesch <m@bues.ch>
337+
Michal Simek <michal.simek@amd.com> <michal.simek@xilinx.com>
318338
Michel Dänzer <michel@tungstengraphics.com>
319339
Michel Lespinasse <michel@lespinasse.org>
320340
Michel Lespinasse <michel@lespinasse.org> <walken@google.com>
@@ -347,6 +367,12 @@ Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
347367
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
348368
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>
349369
Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
370+
Nikolay Aleksandrov <razor@blackwall.org> <naleksan@redhat.com>
371+
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@redhat.com>
372+
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@cumulusnetworks.com>
373+
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@nvidia.com>
374+
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@isovalent.com>
375+
Oleksandr Natalenko <oleksandr@natalenko.name> <oleksandr@redhat.com>
350376
Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>
351377
Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>
352378
Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>
@@ -362,6 +388,8 @@ Paul E. McKenney <paulmck@kernel.org> <paul.mckenney@linaro.org>
362388
Paul E. McKenney <paulmck@kernel.org> <paulmck@linux.ibm.com>
363389
Paul E. McKenney <paulmck@kernel.org> <paulmck@linux.vnet.ibm.com>
364390
Paul E. McKenney <paulmck@kernel.org> <paulmck@us.ibm.com>
391+
Paul Mackerras <paulus@ozlabs.org> <paulus@samba.org>
392+
Paul Mackerras <paulus@ozlabs.org> <paulus@au1.ibm.com>
365393
Peter A Jonsson <pj@ludd.ltu.se>
366394
Peter Oruba <peter.oruba@amd.com>
367395
Peter Oruba <peter@oruba.de>
@@ -374,6 +402,7 @@ Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
374402
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
375403
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
376404
Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>
405+
Rajendra Nayak <quic_rjendra@quicinc.com> <rnayak@codeaurora.org>
377406
Rajesh Shah <rajesh.shah@intel.com>
378407
Ralf Baechle <ralf@linux-mips.org>
379408
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
@@ -382,6 +411,9 @@ Rémi Denis-Courmont <rdenis@simphalempin.com>
382411
Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>
383412
Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>
384413
Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
414+
Richard Leitner <richard.leitner@linux.dev> <dev@g0hl1n.net>
415+
Richard Leitner <richard.leitner@linux.dev> <me@g0hl1n.net>
416+
Richard Leitner <richard.leitner@linux.dev> <richard.leitner@skidata.com>
385417
Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>
386418
Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
387419
Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
@@ -392,6 +424,7 @@ Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
392424
Rudolf Marek <R.Marek@sh.cvut.cz>
393425
Rui Saraiva <rmps@joel.ist.utl.pt>
394426
Sachin P Sant <ssant@in.ibm.com>
427+
Sai Prakash Ranjan <quic_saipraka@quicinc.com> <saiprakash.ranjan@codeaurora.org>
395428
Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>
396429
Sam Ravnborg <sam@mars.ravnborg.org>
397430
Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
@@ -432,6 +465,10 @@ Thomas Graf <tgraf@suug.ch>
432465
Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>
433466
Thomas Pedersen <twp@codeaurora.org>
434467
Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>
468+
Tobias Klauser <tklauser@distanz.ch> <tobias.klauser@gmail.com>
469+
Tobias Klauser <tklauser@distanz.ch> <klto@zhaw.ch>
470+
Tobias Klauser <tklauser@distanz.ch> <tklauser@nuerscht.ch>
471+
Tobias Klauser <tklauser@distanz.ch> <tklauser@xenon.tklauser.home>
435472
Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>
436473
Tony Luck <tony.luck@intel.com>
437474
TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

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+
E: chaosman@ontika.net
234+
D: QNX6 filesystem
235+
232236
N: Greg Banks
233237
E: gnb@alphalink.com.au
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+
E: j@pureftpd.org
895+
D: QNX4 filesystem
896+
889897
N: Peter Denison
890898
E: peterd@pnd-pc.demon.co.uk
891899
W: http://www.pnd-pc.demon.co.uk/promise/
@@ -1259,6 +1267,10 @@ S: USA
12591267
N: Adam Fritzler
12601268
E: mid@zigamorph.net
12611269

1270+
N: Richard "Scuba" A. Frowijn
1271+
E: scuba@wxs.nl
1272+
D: QNX4 filesystem
1273+
12621274
N: Fernando Fuganti
12631275
E: fuganti@conectiva.com.br
12641276
E: fuganti@netbank.com.br
@@ -1694,6 +1706,10 @@ S: Panoramastrasse 18
16941706
S: D-69126 Heidelberg
16951707
S: Germany
16961708

1709+
N: Neil Horman
1710+
M: nhorman@tuxdriver.com
1711+
D: SCTP protocol maintainer.
1712+
16971713
N: Simon Horman
16981714
M: horms@verge.net.au
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+
E: al@alarsen.net
2239+
D: QNX4 filesystem
2240+
22212241
N: Paul Laufer
22222242
E: paul@laufernet.com
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+
E: mathieu.poirier@linaro.org
3484+
D: CoreSight kernel subsystem, Maintainer 2014-2022
3485+
D: Perf tool support for CoreSight
3486+
34623487
N: Robert Schwebel
34633488
E: robert@schwebel.de
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
Contact: selinux@vger.kernel.org
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
Contact: selinux@vger.kernel.org
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
Contact: linux-acpi@vger.kernel.org
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
Contact: linux-block@vger.kernel.org
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)