Skip to content

Commit abe949c

Browse files
author
Ingo Molnar
committed
Merge tag 'v6.12-rc7' into x86/mm, to pick up fixes before applying new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents 035c5e2 + 2d5404c commit abe949c

File tree

927 files changed

+9253
-6107
lines changed

Some content is hidden

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

927 files changed

+9253
-6107
lines changed

.mailmap

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,8 @@ Elliot Berman <quic_eberman@quicinc.com> <eberman@codeaurora.org>
199199
Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>
200200
Enric Balletbo i Serra <eballetbo@kernel.org> <eballetbo@iseebcn.com>
201201
Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
202-
Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>
202+
Eugen Hristev <eugen.hristev@linaro.org> <eugen.hristev@microchip.com>
203+
Eugen Hristev <eugen.hristev@linaro.org> <eugen.hristev@collabora.com>
203204
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
204205
Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>
205206
Faith Ekstrand <faith.ekstrand@collabora.com> <jason@jlekstrand.net>
@@ -282,7 +283,7 @@ Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
282283
Jan Kuliga <jtkuliga.kdev@gmail.com> <jankul@alatek.krakow.pl>
283284
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>
284285
Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>
285-
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@tuni.fi>
286+
Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@parity.io>
286287
Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
287288
Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>
288289
Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
@@ -306,6 +307,11 @@ Jens Axboe <axboe@kernel.dk> <axboe@fb.com>
306307
Jens Axboe <axboe@kernel.dk> <axboe@meta.com>
307308
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
308309
Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
310+
Jesper Dangaard Brouer <hawk@kernel.org> <brouer@redhat.com>
311+
Jesper Dangaard Brouer <hawk@kernel.org> <hawk@comx.dk>
312+
Jesper Dangaard Brouer <hawk@kernel.org> <jbrouer@redhat.com>
313+
Jesper Dangaard Brouer <hawk@kernel.org> <jdb@comx.dk>
314+
Jesper Dangaard Brouer <hawk@kernel.org> <netoptimizer@brouer.com>
309315
Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
310316
Jilai Wang <quic_jilaiw@quicinc.com> <jilaiw@codeaurora.org>
311317
Jiri Kosina <jikos@kernel.org> <jikos@jikos.cz>
@@ -659,6 +665,7 @@ Tomeu Vizoso <tomeu@tomeuvizoso.net> <tomeu.vizoso@collabora.com>
659665
Thomas Graf <tgraf@suug.ch>
660666
Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>
661667
Thomas Pedersen <twp@codeaurora.org>
668+
Thorsten Blum <thorsten.blum@linux.dev> <thorsten.blum@toblux.com>
662669
Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>
663670
Tingwei Zhang <quic_tingwei@quicinc.com> <tingwei@codeaurora.org>
664671
Tirupathi Reddy <quic_tirupath@quicinc.com> <tirupath@codeaurora.org>

CREDITS

Lines changed: 4 additions & 0 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)

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/devicetree/bindings/display/mediatek/mediatek,dpi.yaml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,16 @@ properties:
6363
- const: sleep
6464

6565
power-domains:
66+
description: |
67+
The MediaTek DPI module is typically associated with one of the
68+
following multimedia power domains:
69+
POWER_DOMAIN_DISPLAY
70+
POWER_DOMAIN_VDOSYS
71+
POWER_DOMAIN_MM
72+
The specific power domain used varies depending on the SoC design.
73+
74+
It is recommended to explicitly add the appropriate power domain
75+
property to the DPI node in the device tree.
6676
maxItems: 1
6777

6878
port:
@@ -79,20 +89,6 @@ required:
7989
- clock-names
8090
- port
8191

82-
allOf:
83-
- if:
84-
not:
85-
properties:
86-
compatible:
87-
contains:
88-
enum:
89-
- mediatek,mt6795-dpi
90-
- mediatek,mt8173-dpi
91-
- mediatek,mt8186-dpi
92-
then:
93-
properties:
94-
power-domains: false
95-
9692
additionalProperties: false
9793

9894
examples:

Documentation/devicetree/bindings/display/mediatek/mediatek,split.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ properties:
3838
description: A phandle and PM domain specifier as defined by bindings of
3939
the power controller specified by phandle. See
4040
Documentation/devicetree/bindings/power/power-domain.yaml for details.
41+
maxItems: 1
4142

4243
mediatek,gce-client-reg:
4344
description:
@@ -57,6 +58,9 @@ properties:
5758
clocks:
5859
items:
5960
- description: SPLIT Clock
61+
- description: Used for interfacing with the HDMI RX signal source.
62+
- description: Paired with receiving HDMI RX metadata.
63+
minItems: 1
6064

6165
required:
6266
- compatible
@@ -72,9 +76,24 @@ allOf:
7276
const: mediatek,mt8195-mdp3-split
7377

7478
then:
79+
properties:
80+
clocks:
81+
minItems: 3
82+
7583
required:
7684
- mediatek,gce-client-reg
7785

86+
- if:
87+
properties:
88+
compatible:
89+
contains:
90+
const: mediatek,mt8173-disp-split
91+
92+
then:
93+
properties:
94+
clocks:
95+
maxItems: 1
96+
7897
additionalProperties: false
7998

8099
examples:

Documentation/devicetree/bindings/firmware/arm,scmi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ properties:
124124
atomic mode of operation, even if requested.
125125
default: 0
126126

127-
max-rx-timeout-ms:
127+
arm,max-rx-timeout-ms:
128128
description:
129129
An optional time value, expressed in milliseconds, representing the
130130
transport maximum timeout value for the receive channel. The value should

Documentation/devicetree/bindings/iio/adc/adi,ad7380.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ properties:
6767
A 2.5V to 3.3V supply for the external reference voltage. When omitted,
6868
the internal 2.5V reference is used.
6969

70+
refin-supply:
71+
description:
72+
A 2.5V to 3.3V supply for external reference voltage, for ad7380-4 only.
73+
7074
aina-supply:
7175
description:
7276
The common mode voltage supply for the AINA- pin on pseudo-differential
@@ -135,6 +139,23 @@ allOf:
135139
ainc-supply: false
136140
aind-supply: false
137141

142+
# ad7380-4 uses refin-supply as external reference.
143+
# All other chips from ad738x family use refio as optional external reference.
144+
# When refio-supply is omitted, internal reference is used.
145+
- if:
146+
properties:
147+
compatible:
148+
enum:
149+
- adi,ad7380-4
150+
then:
151+
properties:
152+
refio-supply: false
153+
required:
154+
- refin-supply
155+
else:
156+
properties:
157+
refin-supply: false
158+
138159
examples:
139160
- |
140161
#include <dt-bindings/interrupt-controller/irq.h>

Documentation/devicetree/bindings/net/xlnx,axi-ethernet.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ properties:
6161
- gmii
6262
- rgmii
6363
- sgmii
64-
- 1000BaseX
64+
- 1000base-x
6565

6666
xlnx,phy-type:
6767
description:

0 commit comments

Comments
 (0)