Skip to content

Commit 5516200

Browse files
mchehabmchehab
committed
Merge tag 'v6.12-rc7' into __tmp-hansg-linux-tags_media_atomisp_6_13_1
Linux 6.12-rc7 * tag 'v6.12-rc7': (1909 commits) Linux 6.12-rc7 filemap: Fix bounds checking in filemap_read() i2c: designware: do not hold SCL low when I2C_DYNAMIC_TAR_UPDATE is not set mailmap: add entry for Thorsten Blum ocfs2: remove entry once instead of null-ptr-dereference in ocfs2_xa_remove() signal: restore the override_rlimit logic fs/proc: fix compile warning about variable 'vmcore_mmap_ops' ucounts: fix counter leak in inc_rlimit_get_ucounts() selftests: hugetlb_dio: check for initial conditions to skip in the start mm: fix docs for the kernel parameter ``thp_anon=`` mm/damon/core: avoid overflow in damon_feed_loop_next_input() mm/damon/core: handle zero schemes apply interval mm/damon/core: handle zero {aggregation,ops_update} intervals mm/mlock: set the correct prev on failure objpool: fix to make percpu slot allocation more robust mm/page_alloc: keep track of free highatomic bcachefs: Fix UAF in __promote_alloc() error path bcachefs: Change OPT_STR max to be 1 less than the size of choices array bcachefs: btree_cache.freeable list fixes bcachefs: check the invalid parameter for perf test ...
2 parents 9b47364 + 2d5404c commit 5516200

2,664 files changed

Lines changed: 24790 additions & 17077 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
@@ -74,6 +74,8 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com>
7474
Andrzej Hajda <andrzej.hajda@intel.com> <a.hajda@samsung.com>
7575
André Almeida <andrealmeid@igalia.com> <andrealmeid@collabora.com>
7676
Andy Adamson <andros@citi.umich.edu>
77+
Andy Chiu <andybnac@gmail.com> <andy.chiu@sifive.com>
78+
Andy Chiu <andybnac@gmail.com> <taochiu@synology.com>
7779
Andy Shevchenko <andy@kernel.org> <andy@smile.org.ua>
7880
Andy Shevchenko <andy@kernel.org> <ext-andriy.shevchenko@nokia.com>
7981
Anilkumar Kolli <quic_akolli@quicinc.com> <akolli@codeaurora.org>
@@ -198,18 +200,23 @@ Elliot Berman <quic_eberman@quicinc.com> <eberman@codeaurora.org>
198200
Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>
199201
Enric Balletbo i Serra <eballetbo@kernel.org> <eballetbo@iseebcn.com>
200202
Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
201-
Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>
203+
Eugen Hristev <eugen.hristev@linaro.org> <eugen.hristev@microchip.com>
204+
Eugen Hristev <eugen.hristev@linaro.org> <eugen.hristev@collabora.com>
202205
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
203206
Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>
204207
Faith Ekstrand <faith.ekstrand@collabora.com> <jason@jlekstrand.net>
205208
Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@intel.com>
206209
Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@collabora.com>
210+
Fangrui Song <i@maskray.me> <maskray@google.com>
207211
Felipe W Damasio <felipewd@terra.com.br>
208212
Felix Kuhling <fxkuehl@gmx.de>
209213
Felix Moeller <felix@derklecks.de>
210214
Fenglin Wu <quic_fenglinw@quicinc.com> <fenglinw@codeaurora.org>
211215
Filipe Lautert <filipe@icewall.org>
212216
Finn Thain <fthain@linux-m68k.org> <fthain@telegraphics.com.au>
217+
Fiona Behrens <me@kloenk.dev>
218+
Fiona Behrens <me@kloenk.dev> <me@kloenk.de>
219+
Fiona Behrens <me@kloenk.dev> <fin@nyantec.com>
213220
Franck Bui-Huu <vagabon.xyz@gmail.com>
214221
Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>
215222
Frank Rowand <frowand.list@gmail.com> <frank.rowand@sony.com>
@@ -280,7 +287,7 @@ Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
280287
Jan Kuliga <jtkuliga.kdev@gmail.com> <jankul@alatek.krakow.pl>
281288
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>
282289
Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>
283-
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@tuni.fi>
290+
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@parity.io>
284291
Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
285292
Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>
286293
Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
@@ -304,6 +311,11 @@ Jens Axboe <axboe@kernel.dk> <axboe@fb.com>
304311
Jens Axboe <axboe@kernel.dk> <axboe@meta.com>
305312
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
306313
Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
314+
Jesper Dangaard Brouer <hawk@kernel.org> <brouer@redhat.com>
315+
Jesper Dangaard Brouer <hawk@kernel.org> <hawk@comx.dk>
316+
Jesper Dangaard Brouer <hawk@kernel.org> <jbrouer@redhat.com>
317+
Jesper Dangaard Brouer <hawk@kernel.org> <jdb@comx.dk>
318+
Jesper Dangaard Brouer <hawk@kernel.org> <netoptimizer@brouer.com>
307319
Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
308320
Jilai Wang <quic_jilaiw@quicinc.com> <jilaiw@codeaurora.org>
309321
Jiri Kosina <jikos@kernel.org> <jikos@jikos.cz>
@@ -657,6 +669,7 @@ Tomeu Vizoso <tomeu@tomeuvizoso.net> <tomeu.vizoso@collabora.com>
657669
Thomas Graf <tgraf@suug.ch>
658670
Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>
659671
Thomas Pedersen <twp@codeaurora.org>
672+
Thorsten Blum <thorsten.blum@linux.dev> <thorsten.blum@toblux.com>
660673
Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>
661674
Tingwei Zhang <quic_tingwei@quicinc.com> <tingwei@codeaurora.org>
662675
Tirupathi Reddy <quic_tirupath@quicinc.com> <tirupath@codeaurora.org>

‎CREDITS‎

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,6 +1204,10 @@ S: Dreisbachstrasse 24
12041204
S: D-57250 Netphen
12051205
S: Germany
12061206

1207+
N: Florian Fainelli
1208+
E: f.fainelli@gmail.com
1209+
D: DSA
1210+
12071211
N: Rik Faith
12081212
E: faith@acm.org
12091213
D: Future Domain TMC-16x0 SCSI driver (author)
@@ -1358,10 +1362,6 @@ D: Major kbuild rework during the 2.5 cycle
13581362
D: ISDN Maintainer
13591363
S: USA
13601364

1361-
N: Gerrit Renker
1362-
E: gerrit@erg.abdn.ac.uk
1363-
D: DCCP protocol support.
1364-
13651365
N: Philip Gladstone
13661366
E: philip@gladstonefamily.net
13671367
D: Kernel / timekeeping stuff
@@ -1677,11 +1677,6 @@ W: http://www.carumba.com/
16771677
D: bug toaster (A1 sauce makes all the difference)
16781678
D: Random linux hacker
16791679

1680-
N: James Hogan
1681-
E: jhogan@kernel.org
1682-
D: Metag architecture maintainer
1683-
D: TZ1090 SoC maintainer
1684-
16851680
N: Tim Hockin
16861681
E: thockin@hockin.org
16871682
W: http://www.hockin.org/~thockin
@@ -1697,6 +1692,11 @@ D: hwmon subsystem maintainer
16971692
D: i2c-sis96x and i2c-stub SMBus drivers
16981693
S: USA
16991694

1695+
N: James Hogan
1696+
E: jhogan@kernel.org
1697+
D: Metag architecture maintainer
1698+
D: TZ1090 SoC maintainer
1699+
17001700
N: Dirk Hohndel
17011701
E: hohndel@suse.de
17021702
D: The XFree86[tm] Project
@@ -1872,6 +1872,10 @@ S: K osmidomkum 723
18721872
S: 160 00 Praha 6
18731873
S: Czech Republic
18741874

1875+
N: Seth Jennings
1876+
E: sjenning@redhat.com
1877+
D: Creation and maintenance of zswap
1878+
18751879
N: Jeremy Kerr
18761880
D: Maintainer of SPU File System
18771881

@@ -2188,19 +2192,6 @@ N: Mike Kravetz
21882192
E: mike.kravetz@oracle.com
21892193
D: Maintenance and development of the hugetlb subsystem
21902194

2191-
N: Seth Jennings
2192-
E: sjenning@redhat.com
2193-
D: Creation and maintenance of zswap
2194-
2195-
N: Dan Streetman
2196-
E: ddstreet@ieee.org
2197-
D: Maintenance and development of zswap
2198-
D: Creation and maintenance of the zpool API
2199-
2200-
N: Vitaly Wool
2201-
E: vitaly.wool@konsulko.com
2202-
D: Maintenance and development of zswap
2203-
22042195
N: Andreas S. Krebs
22052196
E: akrebs@altavista.net
22062197
D: CYPRESS CY82C693 chipset IDE, Digital's PC-Alpha 164SX boards
@@ -3191,6 +3182,11 @@ N: Ken Pizzini
31913182
E: ken@halcyon.com
31923183
D: CDROM driver "sonycd535" (Sony CDU-535/531)
31933184

3185+
N: Mathieu Poirier
3186+
E: mathieu.poirier@linaro.org
3187+
D: CoreSight kernel subsystem, Maintainer 2014-2022
3188+
D: Perf tool support for CoreSight
3189+
31943190
N: Stelian Pop
31953191
E: stelian@popies.net
31963192
P: 1024D/EDBB6147 7B36 0E07 04BC 11DC A7A0 D3F7 7185 9E7A EDBB 6147
@@ -3300,6 +3296,10 @@ S: Schlossbergring 9
33003296
S: 79098 Freiburg
33013297
S: Germany
33023298

3299+
N: Gerrit Renker
3300+
E: gerrit@erg.abdn.ac.uk
3301+
D: DCCP protocol support.
3302+
33033303
N: Thomas Renninger
33043304
E: trenn@suse.de
33053305
D: cpupowerutils
@@ -3576,11 +3576,6 @@ D: several improvements to system programs
35763576
S: Oldenburg
35773577
S: Germany
35783578

3579-
N: Mathieu Poirier
3580-
E: mathieu.poirier@linaro.org
3581-
D: CoreSight kernel subsystem, Maintainer 2014-2022
3582-
D: Perf tool support for CoreSight
3583-
35843579
N: Robert Schwebel
35853580
E: robert@schwebel.de
35863581
W: https://www.schwebel.de
@@ -3771,6 +3766,11 @@ S: Chr. Winthersvej 1 B, st.th.
37713766
S: DK-1860 Frederiksberg C
37723767
S: Denmark
37733768

3769+
N: Dan Streetman
3770+
E: ddstreet@ieee.org
3771+
D: Maintenance and development of zswap
3772+
D: Creation and maintenance of the zpool API
3773+
37743774
N: Drew Sullivan
37753775
E: drew@ss.org
37763776
W: http://www.ss.org/
@@ -4286,6 +4286,10 @@ S: Pipers Way
42864286
S: Swindon. SN3 1RJ
42874287
S: England
42884288

4289+
N: Vitaly Wool
4290+
E: vitaly.wool@konsulko.com
4291+
D: Maintenance and development of zswap
4292+
42894293
N: Chris Wright
42904294
E: chrisw@sous-sol.org
42914295
D: hacking on LSM framework and security modules.

‎Documentation/admin-guide/LSM/ipe.rst‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,10 @@ are signed through the PKCS#7 message format to enforce some level of
223223
authorization of the policies (prohibiting an attacker from gaining
224224
unconstrained root, and deploying an "allow all" policy). These
225225
policies must be signed by a certificate that chains to the
226-
``SYSTEM_TRUSTED_KEYRING``. With openssl, the policy can be signed by::
226+
``SYSTEM_TRUSTED_KEYRING``, or to the secondary and/or platform keyrings if
227+
``CONFIG_IPE_POLICY_SIG_SECONDARY_KEYRING`` and/or
228+
``CONFIG_IPE_POLICY_SIG_PLATFORM_KEYRING`` are enabled, respectively.
229+
With openssl, the policy can be signed by::
227230

228231
openssl smime -sign \
229232
-in "$MY_POLICY" \
@@ -266,7 +269,7 @@ in the kernel. This file is write-only and accepts a PKCS#7 signed
266269
policy. Two checks will always be performed on this policy: First, the
267270
``policy_names`` must match with the updated version and the existing
268271
version. Second the updated policy must have a policy version greater than
269-
or equal to the currently-running version. This is to prevent rollback attacks.
272+
the currently-running version. This is to prevent rollback attacks.
270273

271274
The ``delete`` file is used to remove a policy that is no longer needed.
272275
This file is write-only and accepts a value of ``1`` to delete the policy.

‎Documentation/admin-guide/kernel-parameters.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6688,7 +6688,7 @@
66886688
0: no polling (default)
66896689

66906690
thp_anon= [KNL]
6691-
Format: <size>,<size>[KMG]:<state>;<size>-<size>[KMG]:<state>
6691+
Format: <size>[KMG],<size>[KMG]:<state>;<size>[KMG]-<size>[KMG]:<state>
66926692
state is one of "always", "madvise", "never" or "inherit".
66936693
Control the default behavior of the system with respect
66946694
to anonymous transparent hugepages.

‎Documentation/admin-guide/mm/transhuge.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ control by passing the parameter ``transparent_hugepage=always`` or
303303
kernel command line.
304304

305305
Alternatively, each supported anonymous THP size can be controlled by
306-
passing ``thp_anon=<size>,<size>[KMG]:<state>;<size>-<size>[KMG]:<state>``,
306+
passing ``thp_anon=<size>[KMG],<size>[KMG]:<state>;<size>[KMG]-<size>[KMG]:<state>``,
307307
where ``<size>`` is the THP size (must be a power of 2 of PAGE_SIZE and
308308
supported anonymous THP) and ``<state>`` is one of ``always``, ``madvise``,
309309
``never`` or ``inherit``.

‎Documentation/admin-guide/pm/cpufreq.rst‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,8 @@ This governor exposes only one tunable:
425425

426426
``rate_limit_us``
427427
Minimum time (in microseconds) that has to pass between two consecutive
428-
runs of governor computations (default: 1000 times the scaling driver's
429-
transition latency).
428+
runs of governor computations (default: 1.5 times the scaling driver's
429+
transition latency or the maximum 2ms).
430430

431431
The purpose of this tunable is to reduce the scheduler context overhead
432432
of the governor which might be excessive without it.
@@ -474,17 +474,17 @@ This governor exposes the following tunables:
474474
This is how often the governor's worker routine should run, in
475475
microseconds.
476476

477-
Typically, it is set to values of the order of 10000 (10 ms). Its
478-
default value is equal to the value of ``cpuinfo_transition_latency``
479-
for each policy this governor is attached to (but since the unit here
480-
is greater by 1000, this means that the time represented by
481-
``sampling_rate`` is 1000 times greater than the transition latency by
482-
default).
477+
Typically, it is set to values of the order of 2000 (2 ms). Its
478+
default value is to add a 50% breathing room
479+
to ``cpuinfo_transition_latency`` on each policy this governor is
480+
attached to. The minimum is typically the length of two scheduler
481+
ticks.
483482

484483
If this tunable is per-policy, the following shell command sets the time
485-
represented by it to be 750 times as high as the transition latency::
484+
represented by it to be 1.5 times as high as the transition latency
485+
(the default)::
486486

487-
# echo `$(($(cat cpuinfo_transition_latency) * 750 / 1000)) > ondemand/sampling_rate
487+
# echo `$(($(cat cpuinfo_transition_latency) * 3 / 2)) > ondemand/sampling_rate
488488

489489
``up_threshold``
490490
If the estimated CPU load is above this value (in percent), the governor

‎Documentation/arch/arm/mem_alignment.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ones.
1212

1313
Of course this is a bad idea to rely on the alignment trap to perform
1414
unaligned memory access in general. If those access are predictable, you
15-
are better to use the macros provided by include/asm/unaligned.h. The
15+
are better to use the macros provided by include/linux/unaligned.h. The
1616
alignment trap can fixup misaligned access for the exception cases, but at
1717
a high performance cost. It better be rare.
1818

‎Documentation/arch/arm64/silicon-errata.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ stable kernels.
146146
+----------------+-----------------+-----------------+-----------------------------+
147147
| ARM | Cortex-A715 | #2645198 | ARM64_ERRATUM_2645198 |
148148
+----------------+-----------------+-----------------+-----------------------------+
149+
| ARM | Cortex-A715 | #3456084 | ARM64_ERRATUM_3194386 |
150+
+----------------+-----------------+-----------------+-----------------------------+
149151
| ARM | Cortex-A720 | #3456091 | ARM64_ERRATUM_3194386 |
150152
+----------------+-----------------+-----------------+-----------------------------+
151153
| ARM | Cortex-A725 | #3456106 | ARM64_ERRATUM_3194386 |
@@ -186,6 +188,8 @@ stable kernels.
186188
+----------------+-----------------+-----------------+-----------------------------+
187189
| ARM | Neoverse-N2 | #3324339 | ARM64_ERRATUM_3194386 |
188190
+----------------+-----------------+-----------------+-----------------------------+
191+
| ARM | Neoverse-N3 | #3456111 | ARM64_ERRATUM_3194386 |
192+
+----------------+-----------------+-----------------+-----------------------------+
189193
| ARM | Neoverse-V1 | #1619801 | N/A |
190194
+----------------+-----------------+-----------------+-----------------------------+
191195
| ARM | Neoverse-V1 | #3324341 | ARM64_ERRATUM_3194386 |
@@ -289,3 +293,5 @@ stable kernels.
289293
+----------------+-----------------+-----------------+-----------------------------+
290294
| Microsoft | Azure Cobalt 100| #2253138 | ARM64_ERRATUM_2253138 |
291295
+----------------+-----------------+-----------------+-----------------------------+
296+
| Microsoft | Azure Cobalt 100| #3324339 | ARM64_ERRATUM_3194386 |
297+
+----------------+-----------------+-----------------+-----------------------------+

0 commit comments

Comments
 (0)