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

Merge tag 'v6.16' into x86/cpu, to resolve conflict 



Resolve overlapping context conflict between this upstream fix:

  d8010d4b ("x86/bugs: Add a Transient Scheduler Attacks mitigation")

And this pending commit in tip:x86/cpu:

  65f55a30 ("x86/CPU/AMD: Add CPUID faulting support")

  Conflicts:
	arch/x86/kernel/cpu/amd.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 65f55a30 038d61fd

.mailmap

+16 −3
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch> 
Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>

Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>

Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>

Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com>

David Brownell <david-b@pacbell.net>

David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>

David Heidelberg <david@ixit.cz> <d.okias@gmail.com>
@@ -222,6 +223,8 @@ Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com> 
Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>

Domen Puncer <domen@coderock.org>

Douglas Gilbert <dougg@torque.net>

Drew Fustini <fustini@kernel.org> <drew@pdp7.com>

<duje@dujemihanovic.xyz> <duje.mihanovic@skole.hr>

Ed L. Cashin <ecashin@coraid.com>

Elliot Berman <quic_eberman@quicinc.com> <eberman@codeaurora.org>

Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>
@@ -282,6 +285,7 @@ Gustavo Padovan <gustavo@las.ic.unicamp.br> 
Gustavo Padovan <padovan@profusion.mobi>

Hamza Mahfooz <hamzamahfooz@linux.microsoft.com> <hamza.mahfooz@amd.com>

Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>

Hans de Goede <hansg@kernel.org> <hdegoede@redhat.com>

Hans Verkuil <hverkuil@xs4all.nl> <hansverk@cisco.com>

Hans Verkuil <hverkuil@xs4all.nl> <hverkuil-cisco@xs4all.nl>

Harry Yoo <harry.yoo@oracle.com> <42.hyeyoo@gmail.com>
@@ -412,6 +416,7 @@ Kenneth W Chen <kenneth.w.chen@intel.com> 
Kenneth Westfield <quic_kwestfie@quicinc.com> <kwestfie@codeaurora.org>

Kiran Gunda <quic_kgunda@quicinc.com> <kgunda@codeaurora.org>

Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>

Kirill A. Shutemov <kas@kernel.org> <kirill.shutemov@linux.intel.com>

Kishon Vijay Abraham I <kishon@kernel.org> <kishon@ti.com>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@linaro.org>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@somainline.org>
@@ -689,11 +694,16 @@ Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de> 
Senthilkumar N L <quic_snlakshm@quicinc.com> <snlakshm@codeaurora.org>

Serge Hallyn <sergeh@kernel.org> <serge.hallyn@canonical.com>

Serge Hallyn <sergeh@kernel.org> <serue@us.ibm.com>

Sergey Senozhatsky <senozhatsky@chromium.org> <sergey.senozhatsky.work@gmail.com>

Sergey Senozhatsky <senozhatsky@chromium.org> <sergey.senozhatsky@gmail.com>

Sergey Senozhatsky <senozhatsky@chromium.org> <sergey.senozhatsky@mail.by>

Sergey Senozhatsky <senozhatsky@chromium.org> <senozhatsky@google.com>

Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>

Shakeel Butt <shakeel.butt@linux.dev> <shakeelb@google.com>

Shannon Nelson <shannon.nelson@amd.com> <snelson@pensando.io>

Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@intel.com>

Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@oracle.com>

Shannon Nelson <sln@onemain.com> <shannon.nelson@amd.com>

Shannon Nelson <sln@onemain.com> <snelson@pensando.io>

Shannon Nelson <sln@onemain.com> <shannon.nelson@intel.com>

Shannon Nelson <sln@onemain.com> <shannon.nelson@oracle.com>

Sharath Chandra Vurukala <quic_sharathv@quicinc.com> <sharathv@codeaurora.org>

Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>

Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
@@ -827,3 +837,6 @@ Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com> 
Yusuke Goda <goda.yusuke@renesas.com>

Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>

Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>

Zijun Hu <zijun.hu@oss.qualcomm.com> <quic_zijuhu@quicinc.com>

Zijun Hu <zijun.hu@oss.qualcomm.com> <zijuhu@codeaurora.org>

Zijun Hu <zijun_hu@htc.com>

CREDITS

+9 −0
Original line number Diff line number Diff line
@@ -1397,6 +1397,10 @@ N: Thomas Gleixner 
E: tglx@linutronix.de

D: NAND flash hardware support, JFFS2 on NAND flash



N: Jérôme Glisse

E: jglisse@redhat.com

D: HMM - Heterogeneous Memory Management



N: Richard E. Gooch

E: rgooch@atnf.csiro.au

D: parent process death signal to children
@@ -2981,6 +2985,11 @@ S: 521 Pleasant Valley Road 
S: Potsdam, New York 13676

S: USA



N: Shannon Nelson

E: sln@onemain.com

D: Worked on several network drivers including

D: ixgbe, i40e, ionic, pds_core, pds_vdpa, pds_fwctl



N: Dave Neuer

E: dave.neuer@pobox.com

D: Helped implement support for Compaq's H31xx series iPAQs

Documentation/ABI/testing/sysfs-devices-power

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ Date: January 2009 
Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>

Description:

		The /sys/devices/.../async attribute allows the user space to

		enable or diasble the device's suspend and resume callbacks to

		enable or disable the device's suspend and resume callbacks to

		be executed asynchronously (ie. in separate threads, in parallel

		with the main suspend/resume thread) during system-wide power

		transitions (eg. suspend to RAM, hibernation).

Documentation/ABI/testing/sysfs-devices-system-cpu

+1 −0
Original line number Diff line number Diff line
@@ -584,6 +584,7 @@ What: /sys/devices/system/cpu/vulnerabilities 
		/sys/devices/system/cpu/vulnerabilities/spectre_v1

		/sys/devices/system/cpu/vulnerabilities/spectre_v2

		/sys/devices/system/cpu/vulnerabilities/srbds

		/sys/devices/system/cpu/vulnerabilities/tsa

		/sys/devices/system/cpu/vulnerabilities/tsx_async_abort

Date:		January 2018

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

Documentation/ABI/testing/sysfs-driver-ufs

+1 −1
Original line number Diff line number Diff line
@@ -711,7 +711,7 @@ Description: This file shows the thin provisioning type. This is one of 


		The file is read only.



What:		/sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resourse_count

What:		/sys/class/scsi_device/*/device/unit_descriptor/physical_memory_resource_count

Date:		February 2018

Contact:	Stanislav Nijnikov <stanislav.nijnikov@wdc.com>

Description:	This file shows the total physical memory resources. This is