Skip to content

Commit 6704d98

Browse files
committed
BackMerge tag 'v6.19-rc7' into drm-next
Linux 6.19-rc7 This is needed for msm and rust trees. Signed-off-by: Dave Airlie <airlied@redhat.com>
2 parents 504f3ce + 63804fe commit 6704d98

1,317 files changed

Lines changed: 12720 additions & 7007 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.

.mailmap

Lines changed: 15 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>
@@ -417,6 +420,7 @@ Juha Yrjola <at solidboot.com>
417420
Juha Yrjola <juha.yrjola@nokia.com>
418421
Juha Yrjola <juha.yrjola@solidboot.com>
419422
Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
423+
Justin Iurman <justin.iurman@gmail.com> <justin.iurman@uliege.be>
420424
Iskren Chernev <me@iskren.info> <iskren.chernev@gmail.com>
421425
Kalle Valo <kvalo@kernel.org> <kvalo@codeaurora.org>
422426
Kalle Valo <kvalo@kernel.org> <quic_kvalo@quicinc.com>
@@ -473,6 +477,10 @@ Linas Vepstas <linas@austin.ibm.com>
473477
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
474478
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
475479
Linus Lüssing <linus.luessing@c0d3.blue> <ll@simonwunderlich.de>
480+
Linus Walleij <linusw@kernel.org> <linus.walleij@ericsson.com>
481+
Linus Walleij <linusw@kernel.org> <linus.walleij@stericsson.com>
482+
Linus Walleij <linusw@kernel.org> <linus.walleij@linaro.org>
483+
Linus Walleij <linusw@kernel.org> <triad@df.lth.se>
476484
<linux-hardening@vger.kernel.org> <kernel-hardening@lists.openwall.com>
477485
Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
478486
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
@@ -707,6 +715,8 @@ Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
707715
Santosh Shilimkar <santosh.shilimkar@oracle.org>
708716
Santosh Shilimkar <ssantosh@kernel.org>
709717
Sarangdhar Joshi <spjoshi@codeaurora.org>
718+
Saravana Kannan <saravanak@kernel.org> <skannan@codeaurora.org>
719+
Saravana Kannan <saravanak@kernel.org> <saravanak@google.com>
710720
Sascha Hauer <s.hauer@pengutronix.de>
711721
Sahitya Tummala <quic_stummala@quicinc.com> <stummala@codeaurora.org>
712722
Sathishkumar Muruganandam <quic_murugana@quicinc.com> <murugana@codeaurora.org>
@@ -789,13 +799,15 @@ Sven Eckelmann <sven@narfation.org> <sven.eckelmann@open-mesh.com>
789799
Sven Eckelmann <sven@narfation.org> <sven.eckelmann@openmesh.com>
790800
Sven Eckelmann <sven@narfation.org> <sven@open-mesh.com>
791801
Sven Peter <sven@kernel.org> <sven@svenpeter.dev>
802+
Szymon Wilczek <swilczek.lx@gmail.com> <szymonwilczek@gmx.com>
792803
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
793804
Tamizh Chelvam Raja <quic_tamizhr@quicinc.com> <tamizhr@codeaurora.org>
794805
Taniya Das <quic_tdas@quicinc.com> <tdas@codeaurora.org>
795806
Tanzir Hasan <tanzhasanwork@gmail.com> <tanzirh@google.com>
796807
Tejun Heo <htejun@gmail.com>
797808
Tomeu Vizoso <tomeu@tomeuvizoso.net> <tomeu.vizoso@collabora.com>
798809
Thomas Graf <tgraf@suug.ch>
810+
Thomas Gleixner <tglx@kernel.org> <tglx@linutronix.de>
799811
Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>
800812
Thomas Pedersen <twp@codeaurora.org>
801813
Thorsten Blum <thorsten.blum@linux.dev> <thorsten.blum@toblux.com>
@@ -860,7 +872,6 @@ Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
860872
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
861873
WangYuli <wangyuli@aosc.io> <wangyl5933@chinaunicom.cn>
862874
WangYuli <wangyuli@aosc.io> <wangyuli@deepin.org>
863-
WangYuli <wangyuli@aosc.io> <wangyuli@uniontech.com>
864875
Weiwen Hu <huweiwen@linux.alibaba.com> <sehuww@mail.scut.edu.cn>
865876
WeiXiong Liao <gmpy.liaowx@gmail.com> <liaoweixiong@allwinnertech.com>
866877
Wen Gong <quic_wgong@quicinc.com> <wgong@codeaurora.org>
@@ -871,6 +882,8 @@ Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
871882
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
872883
Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
873884
Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>
885+
Yixun Lan <dlan@kernel.org> <dlan@gentoo.org>
886+
Yixun Lan <dlan@kernel.org> <yixun.lan@amlogic.com>
874887
Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>
875888
Yu-Chun Lin <eleanor.lin@realtek.com> <eleanor15x@gmail.com>
876889
Yusuke Goda <goda.yusuke@renesas.com>

CREDITS

Lines changed: 5 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
@@ -2231,6 +2231,10 @@ S: Markham, Ontario
22312231
S: L3R 8B2
22322232
S: Canada
22332233

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

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/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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,10 @@ memory allocations.
494494

495495
The default value depends on CONFIG_MEM_ALLOC_PROFILING_ENABLED_BY_DEFAULT.
496496

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

498502
memory_failure_early_kill
499503
=========================

Documentation/arch/riscv/hwprobe.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,14 @@ The following keys are defined:
281281
* :c:macro:`RISCV_HWPROBE_EXT_ZICBOP`: The Zicbop extension is supported, as
282282
ratified in commit 3dd606f ("Create cmobase-v1.0.pdf") of riscv-CMOs.
283283

284+
* :c:macro:`RISCV_HWPROBE_EXT_ZILSD`: The Zilsd extension is supported as
285+
defined in the RISC-V ISA manual starting from commit f88abf1 ("Integrating
286+
load/store pair for RV32 with the main manual") of the riscv-isa-manual.
287+
288+
* :c:macro:`RISCV_HWPROBE_EXT_ZCLSD`: The Zclsd extension is supported as
289+
defined in the RISC-V ISA manual starting from commit f88abf1 ("Integrating
290+
load/store pair for RV32 with the main manual") of the riscv-isa-manual.
291+
284292
* :c:macro:`RISCV_HWPROBE_KEY_CPUPERF_0`: Deprecated. Returns similar values to
285293
:c:macro:`RISCV_HWPROBE_KEY_MISALIGNED_SCALAR_PERF`, but the key was
286294
mistakenly classified as a bitmask rather than a value.

Documentation/arch/riscv/uabi.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ ISA string ordering in /proc/cpuinfo
77
------------------------------------
88

99
The canonical order of ISA extension names in the ISA string is defined in
10-
chapter 27 of the unprivileged specification.
10+
Chapter 27 of the RISC-V Instruction Set Manual Volume I Unprivileged ISA
11+
(Document Version 20191213).
12+
1113
The specification uses vague wording, such as should, when it comes to ordering,
1214
so for our purposes the following rules apply:
1315

0 commit comments

Comments
 (0)