Skip to content

Commit 5f2ca44

Browse files
author
Ingo Molnar
committed
Merge branch 'linus' into x86/urgent, to pick up dependent commit
We want to fix: 0e11073 ("x86/retpoline: Do the necessary fixup to the Zen3/4 srso return thunk for !SRSO") So merge in Linus's latest into x86/urgent to have it available. Signed-off-by: Ingo Molnar <mingo@kernel.org>
2 parents 3ddf944 + 6c6e47d commit 5f2ca44

File tree

397 files changed

+6406
-2689
lines changed

Some content is hidden

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

397 files changed

+6406
-2689
lines changed

.mailmap

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Adam Oldham <oldhamca@gmail.com>
2020
Adam Radford <aradford@gmail.com>
2121
Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
2222
Adrian Bunk <bunk@stusta.de>
23+
Ajay Kaher <ajay.kaher@broadcom.com> <akaher@vmware.com>
2324
Akhil P Oommen <quic_akhilpo@quicinc.com> <akhilpo@codeaurora.org>
2425
Alan Cox <alan@lxorguk.ukuu.org.uk>
2526
Alan Cox <root@hraefn.swansea.linux.org.uk>
@@ -36,6 +37,7 @@ Alexei Avshalom Lazar <quic_ailizaro@quicinc.com> <ailizaro@codeaurora.org>
3637
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
3738
Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
3839
Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
40+
Alexey Makhalov <alexey.amakhalov@broadcom.com> <amakhalov@vmware.com>
3941
Alex Hung <alexhung@gmail.com> <alex.hung@canonical.com>
4042
Alex Shi <alexs@kernel.org> <alex.shi@intel.com>
4143
Alex Shi <alexs@kernel.org> <alex.shi@linaro.org>
@@ -110,6 +112,7 @@ Brendan Higgins <brendan.higgins@linux.dev> <brendanhiggins@google.com>
110112
Brian Avery <b.avery@hp.com>
111113
Brian King <brking@us.ibm.com>
112114
Brian Silverman <bsilver16384@gmail.com> <brian.silverman@bluerivertech.com>
115+
Bryan Tan <bryan-bt.tan@broadcom.com> <bryantan@vmware.com>
113116
Cai Huoqing <cai.huoqing@linux.dev> <caihuoqing@baidu.com>
114117
Can Guo <quic_cang@quicinc.com> <cang@codeaurora.org>
115118
Carl Huang <quic_cjhuang@quicinc.com> <cjhuang@codeaurora.org>
@@ -529,6 +532,7 @@ Rocky Liao <quic_rjliao@quicinc.com> <rjliao@codeaurora.org>
529532
Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
530533
Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
531534
Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>
535+
Ronak Doshi <ronak.doshi@broadcom.com> <doshir@vmware.com>
532536
Muchun Song <muchun.song@linux.dev> <songmuchun@bytedance.com>
533537
Muchun Song <muchun.song@linux.dev> <smuchun@gmail.com>
534538
Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
@@ -651,6 +655,7 @@ Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
651655
Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
652656
Viresh Kumar <viresh.kumar@linaro.org> <viresh.kumar@linaro.org>
653657
Viresh Kumar <viresh.kumar@linaro.org> <viresh.kumar@linaro.com>
658+
Vishnu Dasa <vishnu.dasa@broadcom.com> <vdasa@vmware.com>
654659
Vivek Aknurwar <quic_viveka@quicinc.com> <viveka@codeaurora.org>
655660
Vivien Didelot <vivien.didelot@gmail.com> <vivien.didelot@savoirfairelinux.com>
656661
Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6599,7 +6599,7 @@
65996599
To turn off having tracepoints sent to printk,
66006600
echo 0 > /proc/sys/kernel/tracepoint_printk
66016601
Note, echoing 1 into this file without the
6602-
tracepoint_printk kernel cmdline option has no effect.
6602+
tp_printk kernel cmdline option has no effect.
66036603

66046604
The tp_printk_stop_on_boot (see below) can also be used
66056605
to stop the printing of events to console at

Documentation/admin-guide/mm/zswap.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ Setting this parameter to 100 will disable the hysteresis.
155155

156156
Some users cannot tolerate the swapping that comes with zswap store failures
157157
and zswap writebacks. Swapping can be disabled entirely (without disabling
158-
zswap itself) on a cgroup-basis as follows:
158+
zswap itself) on a cgroup-basis as follows::
159159

160160
echo 0 > /sys/fs/cgroup/<cgroup-name>/memory.zswap.writeback
161161

@@ -166,7 +166,7 @@ writeback (because the same pages might be rejected again and again).
166166
When there is a sizable amount of cold memory residing in the zswap pool, it
167167
can be advantageous to proactively write these cold pages to swap and reclaim
168168
the memory for other use cases. By default, the zswap shrinker is disabled.
169-
User can enable it as follows:
169+
User can enable it as follows::
170170

171171
echo Y > /sys/module/zswap/parameters/shrinker_enabled
172172

Documentation/dev-tools/testing-overview.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ Some of these tools are listed below:
104104
KASAN and can be used in production. See Documentation/dev-tools/kfence.rst
105105
* lockdep is a locking correctness validator. See
106106
Documentation/locking/lockdep-design.rst
107+
* Runtime Verification (RV) supports checking specific behaviours for a given
108+
subsystem. See Documentation/trace/rv/runtime-verification.rst
107109
* There are several other pieces of debug instrumentation in the kernel, many
108110
of which can be found in lib/Kconfig.debug
109111

Documentation/devicetree/bindings/clock/keystone-gate.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
Status: Unstable - ABI compatibility may be broken in the future
2-
31
Binding for Keystone gate control driver which uses PSC controller IP.
42

53
This binding uses the common clock binding[1].

Documentation/devicetree/bindings/clock/keystone-pll.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
Status: Unstable - ABI compatibility may be broken in the future
2-
31
Binding for keystone PLLs. The main PLL IP typically has a multiplier,
42
a divider and a post divider. The additional PLL IPs like ARMPLL, DDRPLL
53
and PAPLL are controlled by the memory mapped register where as the Main

Documentation/devicetree/bindings/clock/ti/adpll.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
Binding for Texas Instruments ADPLL clock.
22

3-
Binding status: Unstable - ABI compatibility may be broken in the future
4-
53
This binding uses the common clock binding[1]. It assumes a
64
register-mapped ADPLL with two to three selectable input clocks
75
and three to four children.

Documentation/devicetree/bindings/clock/ti/apll.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
Binding for Texas Instruments APLL clock.
22

3-
Binding status: Unstable - ABI compatibility may be broken in the future
4-
53
This binding uses the common clock binding[1]. It assumes a
64
register-mapped APLL with usually two selectable input clocks
75
(reference clock and bypass clock), with analog phase locked

Documentation/devicetree/bindings/clock/ti/autoidle.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
Binding for Texas Instruments autoidle clock.
22

3-
Binding status: Unstable - ABI compatibility may be broken in the future
4-
53
This binding uses the common clock binding[1]. It assumes a register mapped
64
clock which can be put to idle automatically by hardware based on the usage
75
and a configuration bit setting. Autoidle clock is never an individual

Documentation/devicetree/bindings/clock/ti/clockdomain.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
Binding for Texas Instruments clockdomain.
22

3-
Binding status: Unstable - ABI compatibility may be broken in the future
4-
53
This binding uses the common clock binding[1] in consumer role.
64
Every clock on TI SoC belongs to one clockdomain, but software
75
only needs this information for specific clocks which require

0 commit comments

Comments
 (0)