Commit 585a78c1 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into objtool/core, to pick up Xen dependencies 



Pick up dependencies - freshly merged upstream via xen-next - before applying
dependent objtool changes.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 37064583 69308402

.mailmap

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ Aleksey Gorelov <aleksey_gorelov@phoenix.com> 
Alexander Lobakin <alobakin@pm.me> <alobakin@dlink.ru>

Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com>

Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>

Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>

Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>

Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electrons.com>

Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>

Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
@@ -130,6 +132,7 @@ Domen Puncer <domen@coderock.org> 
Douglas Gilbert <dougg@torque.net>

Ed L. Cashin <ecashin@coraid.com>

Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>

Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>

Evgeniy Polyakov <johnpol@2ka.mipt.ru>

Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>

Felipe W Damasio <felipewd@terra.com.br>
@@ -214,6 +217,7 @@ Jisheng Zhang <jszhang@kernel.org> <jszhang@marvell.com> 
Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>

Johan Hovold <johan@kernel.org> <jhovold@gmail.com>

Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>

John Crispin <john@phrozen.org> <blogic@openwrt.org>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

John Stultz <johnstul@us.ibm.com>

Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>
@@ -371,6 +375,7 @@ Rémi Denis-Courmont <rdenis@simphalempin.com> 
Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>

Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>

Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>

Robert Foss <rfoss@kernel.org> <robert.foss@linaro.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>
@@ -422,6 +427,7 @@ Tony Luck <tony.luck@intel.com> 
TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Tudor Ambarus <tudor.ambarus@linaro.org> <tudor.ambarus@microchip.com>

Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>

Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

CREDITS

+15 −0
Original line number Diff line number Diff line
@@ -1173,6 +1173,10 @@ D: Future Domain TMC-16x0 SCSI driver (author) 
D: APM driver (early port)

D: DRM drivers (author of several)



N: Veaceslav Falico

E: vfalico@gmail.com

D: Co-maintainer and co-author of the network bonding driver.



N: János Farkas

E: chexum@shadow.banki.hu

D: romfs, various (mostly networking) fixes
@@ -2489,6 +2493,13 @@ D: XF86_Mach8 
D: XF86_8514

D: cfdisk (curses based disk partitioning program)



N: Mat Martineau

E: mat@martineau.name

D: MPTCP subsystem co-maintainer 2020-2023

D: Keyctl restricted keyring and Diffie-Hellman UAPI

D: Bluetooth L2CAP ERTM mode and AMP

S: USA



N: John S. Marvin

E: jsm@fc.hp.com

D: PA-RISC port
@@ -4172,6 +4183,10 @@ S: B-1206 Jingmao Guojigongyu 
S: 16 Baliqiao Nanjie, Beijing 101100

S: People's Repulic of China



N: Vlad Yasevich

E: vyasevich@gmail.com

D: SCTP protocol maintainer.



N: Aviad Yehezkel

E: aviadye@nvidia.com

D: Kernel TLS implementation and offload support.

Documentation/ABI/stable/sysfs-block

+2 −1
Original line number Diff line number Diff line
@@ -432,7 +432,8 @@ Contact: linux-block@vger.kernel.org 
Description:

		[RW] This is the maximum number of kilobytes that the block

		layer will allow for a filesystem request. Must be smaller than

		or equal to the maximum size allowed by the hardware.

		or equal to the maximum size allowed by the hardware. Write 0

		to use default kernel settings.





What:		/sys/block/<disk>/queue/max_segment_size

Documentation/ABI/stable/sysfs-driver-mlxreg-io

+121 −1
Original line number Diff line number Diff line
@@ -522,7 +522,6 @@ Description: These files allow to each of ASICs by writing 1. 


		The files are write only.





What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/comm_chnl_ready

Date:		July 2022

KernelVersion:	5.20
@@ -542,3 +541,124 @@ Description: The file indicates COME module hardware configuration. 
		The purpose is to expose some minor BOM changes for the same system SKU.



		The file is read only.



What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_pwr_converter_fail

Date:		February 2023

KernelVersion:	6.3

Contact:	Vadim Pasternak <vadimp@nvidia.com>

Description:	This file shows the system reset cause due to power converter

		devices failure.

		Value 1 in file means this is reset cause, 0 - otherwise.



		The file is read only.



What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot1_ap_reset

What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot2_ap_reset

Date:		February 2023

KernelVersion:	6.3

Contact:	Vadim Pasternak <vadimp@nvidia.com>

Description:	These files aim to monitor the status of the External Root of Trust (EROT)

		processor's RESET output to the Application Processor (AP).

		By reading this file, could be determined if the EROT has invalidated or

		revoked AP Firmware, at which point it will hold the AP in RESET until a

		valid firmware is loaded. This protects the AP from running an

		unauthorized firmware. In the normal flow, the AP reset should be released

		after the EROT validates the integrity of the FW, and it should be done so

		as quickly as possible so that the AP boots before the CPU starts to

		communicate to each ASIC.



		The files are read only.



What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot1_recovery

What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot2_recovery

What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot1_reset

What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot2_reset

Date:		February 2023

KernelVersion:	6.3

Contact:	Vadim Pasternak <vadimp@nvidia.com>

Description:	These files aim to perform External Root of Trust (EROT) recovery

		sequence after EROT device failure.

		These EROT devices protect ASICs from unauthorized access and in normal

		flow their reset should be released with system power – earliest power

		up stage, so that EROTs can begin boot and authentication process before

		CPU starts to communicate to ASICs.

		Issuing a reset to the EROT while asserting the recovery signal will cause

		the EROT Application Processor to enter recovery mode so that the EROT FW

		can be updated/recovered.

		For reset/recovery the related file should be toggled by 1/0.



		The files are read/write.



What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot1_wp

What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/erot2_wp

Date:		February 2023

KernelVersion:	6.3

Contact:	Vadim Pasternak <vadimp@nvidia.com>

Description:	These files allow access to External Root of Trust (EROT) for reset

		and recovery sequence after EROT device failure.

		Default is 0 (programming disabled).

		If the system is in locked-down mode writing this file will not be allowed.



		The files are read/write.



What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/spi_chnl_select

Date:		February 2023

KernelVersion:	6.3

Contact:	Vadim Pasternak <vadimp@nvidia.com>

Description:	This file allows SPI chip selection for External Root of Trust (EROT)

		device Out-of-Band recovery.

		File can be written with 0 or with 1. It selects which EROT can be accessed

		through SPI device.



		The file is read/write.



What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/asic_pg_fail

Date:		February 2023

KernelVersion:	6.3

Contact:	Vadim Pasternak vadimp@nvidia.com

Description:	This file shows ASIC Power Good status.

		Value 1 in file means ASIC Power Good failed, 0 - otherwise.



		The file is read only.



What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/clk_brd1_boot_fail

What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/clk_brd2_boot_fail

What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/clk_brd_fail

Date:		February 2023

KernelVersion:	6.3

Contact:	Vadim Pasternak vadimp@nvidia.com

Description:	These files are related to clock boards status in system.

		- clk_brd1_boot_fail: warning about 1-st clock board failed to boot from CI.

		- clk_brd2_boot_fail: warning about 2-nd clock board failed to boot from CI.

		- clk_brd_fail: error about common clock board boot failure.



		The files are read only.



What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/clk_brd_prog_en

Date:		February 2023

KernelVersion:	6.3

Contact:	Vadim Pasternak <vadimp@nvidia.com>

Description:	This file enables programming of clock boards.

		Default is 0 (programming disabled).

		If the system is in locked-down mode writing this file will not be allowed.



		The file is read/write.



What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/pwr_converter_prog_en

Date:		February 2023

KernelVersion:	6.3

Contact:	Vadim Pasternak <vadimp@nvidia.com>

Description:	This file enables programming of power converters.

		Default is 0 (programming disabled).

		If the system is in locked-down mode writing this file will not be allowed.



		The file is read/write.



What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_ac_ok_fail

Date:		February 2023

KernelVersion:	6.3

Contact:	Vadim Pasternak <vadimp@nvidia.com>

Description:	This file shows the system reset cause due to AC power failure.

		Value 1 in file means this is reset cause, 0 - otherwise.



		The file is read only.

Documentation/ABI/stable/sysfs-hypervisor-xen

+13 −0
Original line number Diff line number Diff line
@@ -120,3 +120,16 @@ Contact: xen-devel@lists.xenproject.org 
Description:	If running under Xen:

		The Xen version is in the format <major>.<minor><extra>

		This is the <minor> part of it.



What:		/sys/hypervisor/start_flags/*

Date:		March 2023

KernelVersion:	6.3.0

Contact:	xen-devel@lists.xenproject.org

Description:	If running under Xen:

		All bits in Xen's start-flags are represented as

		boolean files, returning '1' if set, '0' otherwise.

		This takes the place of the defunct /proc/xen/capabilities,

		which would contain "control_d" on dom0, and be empty

		otherwise.  This flag is now exposed as "initdomain" in

		addition to the "privileged" flag; all other possible flags

		are accessible as "unknownXX".