Commit 5f2ca44e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/urgent, to pick up dependent commit 



We want to fix:

  0e110732 ("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: default avatarIngo Molnar <mingo@kernel.org>
parents 3ddf944b 6c6e47d6

.mailmap

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ Adam Oldham <oldhamca@gmail.com> 
Adam Radford <aradford@gmail.com>

Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>

Adrian Bunk <bunk@stusta.de>

Ajay Kaher <ajay.kaher@broadcom.com> <akaher@vmware.com>

Akhil P Oommen <quic_akhilpo@quicinc.com> <akhilpo@codeaurora.org>

Alan Cox <alan@lxorguk.ukuu.org.uk>

Alan Cox <root@hraefn.swansea.linux.org.uk>
@@ -36,6 +37,7 @@ Alexei Avshalom Lazar <quic_ailizaro@quicinc.com> <ailizaro@codeaurora.org> 
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>

Alexei Starovoitov <ast@kernel.org> <ast@fb.com>

Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>

Alexey Makhalov <alexey.amakhalov@broadcom.com> <amakhalov@vmware.com>

Alex Hung <alexhung@gmail.com> <alex.hung@canonical.com>

Alex Shi <alexs@kernel.org> <alex.shi@intel.com>

Alex Shi <alexs@kernel.org> <alex.shi@linaro.org>
@@ -110,6 +112,7 @@ Brendan Higgins <brendan.higgins@linux.dev> <brendanhiggins@google.com> 
Brian Avery <b.avery@hp.com>

Brian King <brking@us.ibm.com>

Brian Silverman <bsilver16384@gmail.com> <brian.silverman@bluerivertech.com>

Bryan Tan <bryan-bt.tan@broadcom.com> <bryantan@vmware.com>

Cai Huoqing <cai.huoqing@linux.dev> <caihuoqing@baidu.com>

Can Guo <quic_cang@quicinc.com> <cang@codeaurora.org>

Carl Huang <quic_cjhuang@quicinc.com> <cjhuang@codeaurora.org>
@@ -529,6 +532,7 @@ Rocky Liao <quic_rjliao@quicinc.com> <rjliao@codeaurora.org> 
Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>

Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>

Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>

Ronak Doshi <ronak.doshi@broadcom.com> <doshir@vmware.com>

Muchun Song <muchun.song@linux.dev> <songmuchun@bytedance.com>

Muchun Song <muchun.song@linux.dev> <smuchun@gmail.com>

Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
@@ -651,6 +655,7 @@ Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com> 
Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>

Viresh Kumar <viresh.kumar@linaro.org> <viresh.kumar@linaro.org>

Viresh Kumar <viresh.kumar@linaro.org> <viresh.kumar@linaro.com>

Vishnu Dasa <vishnu.dasa@broadcom.com> <vdasa@vmware.com>

Vivek Aknurwar <quic_viveka@quicinc.com> <viveka@codeaurora.org>

Vivien Didelot <vivien.didelot@gmail.com> <vivien.didelot@savoirfairelinux.com>

Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -6599,7 +6599,7 @@ 
			To turn off having tracepoints sent to printk,

			 echo 0 > /proc/sys/kernel/tracepoint_printk

			Note, echoing 1 into this file without the

			tracepoint_printk kernel cmdline option has no effect.

			tp_printk kernel cmdline option has no effect.



			The tp_printk_stop_on_boot (see below) can also be used

			to stop the printing of events to console at

Documentation/admin-guide/mm/zswap.rst

+2 −2
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ Setting this parameter to 100 will disable the hysteresis. 


Some users cannot tolerate the swapping that comes with zswap store failures

and zswap writebacks. Swapping can be disabled entirely (without disabling

zswap itself) on a cgroup-basis as follows:

zswap itself) on a cgroup-basis as follows::



	echo 0 > /sys/fs/cgroup/<cgroup-name>/memory.zswap.writeback
@@ -166,7 +166,7 @@ writeback (because the same pages might be rejected again and again). 
When there is a sizable amount of cold memory residing in the zswap pool, it

can be advantageous to proactively write these cold pages to swap and reclaim

the memory for other use cases. By default, the zswap shrinker is disabled.

User can enable it as follows:

User can enable it as follows::



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

Documentation/dev-tools/testing-overview.rst

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ Some of these tools are listed below: 
  KASAN and can be used in production. See Documentation/dev-tools/kfence.rst

* lockdep is a locking correctness validator. See

  Documentation/locking/lockdep-design.rst

* Runtime Verification (RV) supports checking specific behaviours for a given

  subsystem. See Documentation/trace/rv/runtime-verification.rst

* There are several other pieces of debug instrumentation in the kernel, many

  of which can be found in lib/Kconfig.debug

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

+0 −2
Original line number Diff line number Diff line 
Status: Unstable - ABI compatibility may be broken in the future



Binding for Keystone gate control driver which uses PSC controller IP.



This binding uses the common clock binding[1].