Skip to content

Commit 3e40671

Browse files
author
Peter Zijlstra
committed
Merge branch 'v6.19-rc8'
Update to avoid conflicts with /urgent patches. Signed-off-by: Peter Zijlstra <peterz@infradead.org>
2 parents 5c4378b + 18f7fcd commit 3e40671

1,865 files changed

Lines changed: 17775 additions & 9686 deletions

File tree

Some content is hidden

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

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -748,6 +748,7 @@ ForEachMacros:
748748
- 'ynl_attr_for_each_nested'
749749
- 'ynl_attr_for_each_payload'
750750
- 'zorro_for_each_dev'
751+
- 'zpci_bus_for_each'
751752

752753
IncludeBlocks: Preserve
753754
IncludeCategories:

.mailmap

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#
1313
Aaron Durbin <adurbin@google.com>
1414
Abel Vesa <abelvesa@kernel.org> <abel.vesa@nxp.com>
15+
Abel Vesa <abelvesa@kernel.org> <abel.vesa@linaro.org>
1516
Abel Vesa <abelvesa@kernel.org> <abelvesa@gmail.com>
1617
Abhijeet Dharmapurikar <quic_adharmap@quicinc.com> <adharmap@codeaurora.org>
1718
Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>
@@ -127,7 +128,8 @@ Barry Song <baohua@kernel.org> <Baohua.Song@csr.com>
127128
Barry Song <baohua@kernel.org> <barry.song@analog.com>
128129
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
129130
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
130-
Bartosz Golaszewski <brgl@bgdev.pl> <bgolaszewski@baylibre.com>
131+
Bartosz Golaszewski <brgl@kernel.org> <bartosz.golaszewski@linaro.org>
132+
Bartosz Golaszewski <brgl@kernel.org> <bgolaszewski@baylibre.com>
131133
Ben Dooks <ben-linux@fluff.org> <ben.dooks@simtec.co.uk>
132134
Ben Dooks <ben-linux@fluff.org> <ben.dooks@sifive.com>
133135
Ben Gardner <bgardner@wabtec.com>
@@ -206,6 +208,7 @@ Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
206208
Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>
207209
Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
208210
Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
211+
Daniel Thompson <danielt@kernel.org> <daniel.thompson@linaro.org>
209212
Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com>
210213
David Brownell <david-b@pacbell.net>
211214
David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>
@@ -415,6 +418,7 @@ Juha Yrjola <at solidboot.com>
415418
Juha Yrjola <juha.yrjola@nokia.com>
416419
Juha Yrjola <juha.yrjola@solidboot.com>
417420
Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
421+
Justin Iurman <justin.iurman@gmail.com> <justin.iurman@uliege.be>
418422
Iskren Chernev <me@iskren.info> <iskren.chernev@gmail.com>
419423
Kalle Valo <kvalo@kernel.org> <kvalo@codeaurora.org>
420424
Kalle Valo <kvalo@kernel.org> <quic_kvalo@quicinc.com>
@@ -471,6 +475,10 @@ Linas Vepstas <linas@austin.ibm.com>
471475
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
472476
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
473477
Linus Lüssing <linus.luessing@c0d3.blue> <ll@simonwunderlich.de>
478+
Linus Walleij <linusw@kernel.org> <linus.walleij@ericsson.com>
479+
Linus Walleij <linusw@kernel.org> <linus.walleij@stericsson.com>
480+
Linus Walleij <linusw@kernel.org> <linus.walleij@linaro.org>
481+
Linus Walleij <linusw@kernel.org> <triad@df.lth.se>
474482
<linux-hardening@vger.kernel.org> <kernel-hardening@lists.openwall.com>
475483
Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
476484
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
@@ -704,6 +712,8 @@ Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
704712
Santosh Shilimkar <santosh.shilimkar@oracle.org>
705713
Santosh Shilimkar <ssantosh@kernel.org>
706714
Sarangdhar Joshi <spjoshi@codeaurora.org>
715+
Saravana Kannan <saravanak@kernel.org> <skannan@codeaurora.org>
716+
Saravana Kannan <saravanak@kernel.org> <saravanak@google.com>
707717
Sascha Hauer <s.hauer@pengutronix.de>
708718
Sahitya Tummala <quic_stummala@quicinc.com> <stummala@codeaurora.org>
709719
Sathishkumar Muruganandam <quic_murugana@quicinc.com> <murugana@codeaurora.org>
@@ -786,13 +796,15 @@ Sven Eckelmann <sven@narfation.org> <sven.eckelmann@open-mesh.com>
786796
Sven Eckelmann <sven@narfation.org> <sven.eckelmann@openmesh.com>
787797
Sven Eckelmann <sven@narfation.org> <sven@open-mesh.com>
788798
Sven Peter <sven@kernel.org> <sven@svenpeter.dev>
799+
Szymon Wilczek <swilczek.lx@gmail.com> <szymonwilczek@gmx.com>
789800
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
790801
Tamizh Chelvam Raja <quic_tamizhr@quicinc.com> <tamizhr@codeaurora.org>
791802
Taniya Das <quic_tdas@quicinc.com> <tdas@codeaurora.org>
792803
Tanzir Hasan <tanzhasanwork@gmail.com> <tanzirh@google.com>
793804
Tejun Heo <htejun@gmail.com>
794805
Tomeu Vizoso <tomeu@tomeuvizoso.net> <tomeu.vizoso@collabora.com>
795806
Thomas Graf <tgraf@suug.ch>
807+
Thomas Gleixner <tglx@kernel.org> <tglx@linutronix.de>
796808
Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>
797809
Thomas Pedersen <twp@codeaurora.org>
798810
Thorsten Blum <thorsten.blum@linux.dev> <thorsten.blum@toblux.com>
@@ -839,6 +851,7 @@ Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com>
839851
Veera Sundaram Sankaran <quic_veeras@quicinc.com> <veeras@codeaurora.org>
840852
Veerabhadrarao Badiganti <quic_vbadigan@quicinc.com> <vbadigan@codeaurora.org>
841853
Venkateswara Naralasetty <quic_vnaralas@quicinc.com> <vnaralas@codeaurora.org>
854+
Viacheslav Bocharov <v@baodeep.com> <adeep@lexina.in>
842855
Vikash Garodia <vikash.garodia@oss.qualcomm.com> <vgarodia@codeaurora.org>
843856
Vikash Garodia <vikash.garodia@oss.qualcomm.com> <quic_vgarodia@quicinc.com>
844857
Vincent Mailhol <mailhol@kernel.org> <mailhol.vincent@wanadoo.fr>
@@ -857,7 +870,6 @@ Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
857870
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
858871
WangYuli <wangyuli@aosc.io> <wangyl5933@chinaunicom.cn>
859872
WangYuli <wangyuli@aosc.io> <wangyuli@deepin.org>
860-
WangYuli <wangyuli@aosc.io> <wangyuli@uniontech.com>
861873
Weiwen Hu <huweiwen@linux.alibaba.com> <sehuww@mail.scut.edu.cn>
862874
WeiXiong Liao <gmpy.liaowx@gmail.com> <liaoweixiong@allwinnertech.com>
863875
Wen Gong <quic_wgong@quicinc.com> <wgong@codeaurora.org>
@@ -868,6 +880,8 @@ Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
868880
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
869881
Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
870882
Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>
883+
Yixun Lan <dlan@kernel.org> <dlan@gentoo.org>
884+
Yixun Lan <dlan@kernel.org> <yixun.lan@amlogic.com>
871885
Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>
872886
Yu-Chun Lin <eleanor.lin@realtek.com> <eleanor15x@gmail.com>
873887
Yusuke Goda <goda.yusuke@renesas.com>

CREDITS

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1398,7 +1398,7 @@ D: SRM environment driver (for Alpha systems)
13981398
P: 1024D/8399E1BB 250D 3BCF 7127 0D8C A444 A961 1DBD 5E75 8399 E1BB
13991399

14001400
N: Thomas Gleixner
1401-
E: tglx@linutronix.de
1401+
E: tglx@kernel.org
14021402
D: NAND flash hardware support, JFFS2 on NAND flash
14031403

14041404
N: Jérôme Glisse
@@ -1987,6 +1987,7 @@ D: netfilter: TCP window tracking code
19871987
D: netfilter: raw table
19881988
D: netfilter: iprange match
19891989
D: netfilter: new logging interfaces
1990+
D: netfilter: ipset
19901991
D: netfilter: various other hacks
19911992
S: Tata
19921993
S: Hungary
@@ -2230,6 +2231,10 @@ S: Markham, Ontario
22302231
S: L3R 8B2
22312232
S: Canada
22322233

2234+
N: Krzysztof Kozlowski
2235+
E: krzk@kernel.org
2236+
D: NFC network subsystem and drivers maintainer
2237+
22332238
N: Christian Krafft
22342239
D: PowerPC Cell support
22352240

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
What: /sys/kernel/time/aux_clocks/<ID>/enable
22
Date: May 2025
3-
Contact: Thomas Gleixner <tglx@linutronix.de>
3+
Contact: Thomas Gleixner <tglx@kernel.org>
44
Description:
55
Controls the enablement of auxiliary clock timekeepers.

Documentation/ABI/testing/sysfs-devices-soc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ Date: January 2012
1717
contact: Lee Jones <lee@kernel.org>
1818
Description:
1919
Read-only attribute common to all SoCs. Contains the SoC machine
20-
name (e.g. Ux500).
20+
name (e.g. DB8500).
2121

2222
What: /sys/devices/socX/family
2323
Date: January 2012
2424
contact: Lee Jones <lee@kernel.org>
2525
Description:
2626
Read-only attribute common to all SoCs. Contains SoC family name
27-
(e.g. DB8500).
27+
(e.g. ux500).
2828

2929
On many of ARM based silicon with SMCCC v1.2+ compliant firmware
3030
this will contain the JEDEC JEP106 manufacturer’s identification

Documentation/admin-guide/blockdev/zoned_loop.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ MB and a zone capacity of 63 MB::
134134

135135
$ modprobe zloop
136136
$ mkdir -p /var/local/zloop/0
137-
$ echo "add capacity_mb=2048,zone_size_mb=64,zone_capacity=63MB" > /dev/zloop-control
137+
$ echo "add capacity_mb=2048,zone_size_mb=64,zone_capacity_mb=63" > /dev/zloop-control
138138

139139
For the device created (/dev/zloop0), the zone backing files are all created
140140
under the default base directory (/var/local/zloop)::

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2917,6 +2917,41 @@ Kernel parameters
29172917
for Movable pages. "nn[KMGTPE]", "nn%", and "mirror"
29182918
are exclusive, so you cannot specify multiple forms.
29192919

2920+
kfence.burst= [MM,KFENCE] The number of additional successive
2921+
allocations to be attempted through KFENCE for each
2922+
sample interval.
2923+
Format: <unsigned integer>
2924+
Default: 0
2925+
2926+
kfence.check_on_panic=
2927+
[MM,KFENCE] Whether to check all KFENCE-managed objects'
2928+
canaries on panic.
2929+
Format: <bool>
2930+
Default: false
2931+
2932+
kfence.deferrable=
2933+
[MM,KFENCE] Whether to use a deferrable timer to trigger
2934+
allocations. This avoids forcing CPU wake-ups if the
2935+
system is idle, at the risk of a less predictable
2936+
sample interval.
2937+
Format: <bool>
2938+
Default: CONFIG_KFENCE_DEFERRABLE
2939+
2940+
kfence.sample_interval=
2941+
[MM,KFENCE] KFENCE's sample interval in milliseconds.
2942+
Format: <unsigned integer>
2943+
0 - Disable KFENCE.
2944+
>0 - Enabled KFENCE with given sample interval.
2945+
Default: CONFIG_KFENCE_SAMPLE_INTERVAL
2946+
2947+
kfence.skip_covered_thresh=
2948+
[MM,KFENCE] If pool utilization reaches this threshold
2949+
(pool usage%), KFENCE limits currently covered
2950+
allocations of the same source from further filling
2951+
up the pool.
2952+
Format: <unsigned integer>
2953+
Default: 75
2954+
29202955
kgdbdbgp= [KGDB,HW,EARLY] kgdb over EHCI usb debug port.
29212956
Format: <Controller#>[,poll interval]
29222957
The controller # is the number of the ehci usb debug

Documentation/admin-guide/laptops/alienware-wmi.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ information.
105105

106106
Manual fan control on the other hand, is not exposed directly by the AWCC
107107
interface. Instead it let's us control a fan `boost` value. This `boost` value
108-
has the following aproximate behavior over the fan pwm:
108+
has the following approximate behavior over the fan pwm:
109109

110110
::
111111

Documentation/admin-guide/sysctl/net.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,14 @@ netdev_max_backlog
303303
Maximum number of packets, queued on the INPUT side, when the interface
304304
receives packets faster than kernel can process them.
305305

306+
qdisc_max_burst
307+
------------------
308+
309+
Maximum number of packets that can be temporarily stored before
310+
reaching qdisc.
311+
312+
Default: 1000
313+
306314
netdev_rss_key
307315
--------------
308316

Documentation/admin-guide/sysctl/vm.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,8 @@ eventually gets pushed out to disk. This tunable is used to define when dirty
231231
inode is old enough to be eligible for writeback by the kernel flusher threads.
232232
And, it is also used as the interval to wakeup dirtytime_writeback thread.
233233

234+
Setting this to zero disables periodic dirtytime writeback.
235+
234236

235237
dirty_writeback_centisecs
236238
=========================
@@ -494,6 +496,10 @@ memory allocations.
494496

495497
The default value depends on CONFIG_MEM_ALLOC_PROFILING_ENABLED_BY_DEFAULT.
496498

499+
When CONFIG_MEM_ALLOC_PROFILING_DEBUG=y, this control is read-only to avoid
500+
warnings produced by allocations made while profiling is disabled and freed
501+
when it's enabled.
502+
497503

498504
memory_failure_early_kill
499505
=========================

0 commit comments

Comments
 (0)