Skip to content

Commit 53d35ad

Browse files
Merge pull request #43 from torvalds/master
Sync updates
2 parents 2831efb + 6c79021 commit 53d35ad

File tree

886 files changed

+8434
-4811
lines changed

Some content is hidden

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

886 files changed

+8434
-4811
lines changed

.mailmap

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
207207
Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>
208208
Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
209209
Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
210+
Daniel Thompson <danielt@kernel.org> <daniel.thompson@linaro.org>
210211
Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com>
211212
David Brownell <david-b@pacbell.net>
212213
David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>
@@ -416,6 +417,7 @@ Juha Yrjola <at solidboot.com>
416417
Juha Yrjola <juha.yrjola@nokia.com>
417418
Juha Yrjola <juha.yrjola@solidboot.com>
418419
Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
420+
Justin Iurman <justin.iurman@gmail.com> <justin.iurman@uliege.be>
419421
Iskren Chernev <me@iskren.info> <iskren.chernev@gmail.com>
420422
Kalle Valo <kvalo@kernel.org> <kvalo@codeaurora.org>
421423
Kalle Valo <kvalo@kernel.org> <quic_kvalo@quicinc.com>
@@ -472,6 +474,10 @@ Linas Vepstas <linas@austin.ibm.com>
472474
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
473475
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
474476
Linus Lüssing <linus.luessing@c0d3.blue> <ll@simonwunderlich.de>
477+
Linus Walleij <linusw@kernel.org> <linus.walleij@ericsson.com>
478+
Linus Walleij <linusw@kernel.org> <linus.walleij@stericsson.com>
479+
Linus Walleij <linusw@kernel.org> <linus.walleij@linaro.org>
480+
Linus Walleij <linusw@kernel.org> <triad@df.lth.se>
475481
<linux-hardening@vger.kernel.org> <kernel-hardening@lists.openwall.com>
476482
Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
477483
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
@@ -705,6 +711,8 @@ Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
705711
Santosh Shilimkar <santosh.shilimkar@oracle.org>
706712
Santosh Shilimkar <ssantosh@kernel.org>
707713
Sarangdhar Joshi <spjoshi@codeaurora.org>
714+
Saravana Kannan <saravanak@kernel.org> <skannan@codeaurora.org>
715+
Saravana Kannan <saravanak@kernel.org> <saravanak@google.com>
708716
Sascha Hauer <s.hauer@pengutronix.de>
709717
Sahitya Tummala <quic_stummala@quicinc.com> <stummala@codeaurora.org>
710718
Sathishkumar Muruganandam <quic_murugana@quicinc.com> <murugana@codeaurora.org>
@@ -787,13 +795,15 @@ Sven Eckelmann <sven@narfation.org> <sven.eckelmann@open-mesh.com>
787795
Sven Eckelmann <sven@narfation.org> <sven.eckelmann@openmesh.com>
788796
Sven Eckelmann <sven@narfation.org> <sven@open-mesh.com>
789797
Sven Peter <sven@kernel.org> <sven@svenpeter.dev>
798+
Szymon Wilczek <swilczek.lx@gmail.com> <szymonwilczek@gmx.com>
790799
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
791800
Tamizh Chelvam Raja <quic_tamizhr@quicinc.com> <tamizhr@codeaurora.org>
792801
Taniya Das <quic_tdas@quicinc.com> <tdas@codeaurora.org>
793802
Tanzir Hasan <tanzhasanwork@gmail.com> <tanzirh@google.com>
794803
Tejun Heo <htejun@gmail.com>
795804
Tomeu Vizoso <tomeu@tomeuvizoso.net> <tomeu.vizoso@collabora.com>
796805
Thomas Graf <tgraf@suug.ch>
806+
Thomas Gleixner <tglx@kernel.org> <tglx@linutronix.de>
797807
Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>
798808
Thomas Pedersen <twp@codeaurora.org>
799809
Thorsten Blum <thorsten.blum@linux.dev> <thorsten.blum@toblux.com>

CREDITS

Lines changed: 1 addition & 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
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/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/x86/topology.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ with the generic one and look at this one in parallel for the x86 specifics.
1717
Needless to say, code should use the generic functions - this file is *only*
1818
here to *document* the inner workings of x86 topology.
1919

20-
Started by Thomas Gleixner <tglx@linutronix.de> and Borislav Petkov <bp@alien8.de>.
20+
Started by Thomas Gleixner <tglx@kernel.org> and Borislav Petkov <bp@alien8.de>.
2121

2222
The main aim of the topology facilities is to present adequate interfaces to
2323
code which needs to know/query/use the structure of the running system wrt

Documentation/core-api/cpu_hotplug.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CPU hotplug in the Kernel
88
Srivatsa Vaddagiri <vatsa@in.ibm.com>,
99
Ashok Raj <ashok.raj@intel.com>,
1010
Joel Schopp <jschopp@austin.ibm.com>,
11-
Thomas Gleixner <tglx@linutronix.de>
11+
Thomas Gleixner <tglx@kernel.org>
1212

1313
Introduction
1414
============

Documentation/core-api/genericirq.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,6 @@ Credits
439439

440440
The following people have contributed to this document:
441441

442-
1. Thomas Gleixner tglx@linutronix.de
442+
1. Thomas Gleixner tglx@kernel.org
443443

444444
2. Ingo Molnar mingo@elte.hu

0 commit comments

Comments
 (0)