Commit a6f844da authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge tag 'v5.18' into rdma.git for-next 

Following patches have dependencies.

Resolve the merge conflict in
drivers/net/ethernet/mellanox/mlx5/core/main.c by keeping the new names
for the fs functions following linux-next:

https://lore.kernel.org/r/20220519113529.226bc3e2@canb.auug.org.au/



Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parents b599b310 4b0986a3

.mailmap

+7 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ Andrey Konovalov <andreyknvl@gmail.com> <andreyknvl@google.com> 
Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>

Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com>

Andrzej Hajda <andrzej.hajda@intel.com> <a.hajda@samsung.com>

André Almeida <andrealmeid@igalia.com> <andrealmeid@collabora.com>

Andy Adamson <andros@citi.umich.edu>

Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>

Antoine Tenart <atenart@kernel.org> <antoine.tenart@free-electrons.com>
@@ -204,6 +205,7 @@ Juha Yrjola <at solidboot.com> 
Juha Yrjola <juha.yrjola@nokia.com>

Juha Yrjola <juha.yrjola@solidboot.com>

Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>

Kalle Valo <kvalo@kernel.org> <kvalo@codeaurora.org>

Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>

Kay Sievers <kay.sievers@vrfy.org>

Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>
@@ -249,6 +251,7 @@ Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com> 
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>

Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com> <martyna.szapar-mudlaw@intel.com>

Mathieu Othacehe <m.othacehe@gmail.com>

Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>

Matthew Wilcox <willy@infradead.org> <matthew@wil.cx>
@@ -391,6 +394,10 @@ Uwe Kleine-König <ukleinek@strlen.de> 
Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Vasily Averin <vasily.averin@linux.dev> <vvs@virtuozzo.com>

Vasily Averin <vasily.averin@linux.dev> <vvs@openvz.org>

Vasily Averin <vasily.averin@linux.dev> <vvs@parallels.com>

Vasily Averin <vasily.averin@linux.dev> <vvs@sw.ru>

Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>

Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>

Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>

Documentation/ABI/testing/sysfs-class-firmware-attributes

+26 −22
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ Description: 
					    <value>[ForceIf:<attribute>=<value>]

					    <value>[ForceIfNot:<attribute>=<value>]



					For example:

					For example::



					    LegacyOrom/dell_value_modifier has value:

						    Disabled[ForceIf:SecureBoot=Enabled]
@@ -212,7 +212,7 @@ Description: 
		the next boot.



		Lenovo specific class extensions

		------------------------------

		--------------------------------



		On Lenovo systems the following additional settings are available:
@@ -246,9 +246,7 @@ Description: 
					that is being referenced (e.g hdd0, hdd1 etc)

					This attribute defaults to device 0.



		certificate:

		signature:

		save_signature:

		certificate, signature, save_signature:

					These attributes are used for certificate based authentication. This is

					used in conjunction with a signing server as an alternative to password

					based authentication.
@@ -257,21 +255,26 @@ Description: 
					The attributes can be displayed to check the stored value.



					Some usage examples:

					Installing a certificate to enable feature:

						echo <supervisor password > authentication/Admin/current_password

						echo <signed certificate> > authentication/Admin/certificate



					Updating the installed certificate:

						echo <signature> > authentication/Admin/signature

						echo <signed certificate> > authentication/Admin/certificate

						Installing a certificate to enable feature::



							echo "supervisor password" > authentication/Admin/current_password

							echo "signed certificate" > authentication/Admin/certificate



						Updating the installed certificate::



					Removing the installed certificate:

						echo <signature> > authentication/Admin/signature

						echo '' > authentication/Admin/certificate

							echo "signature" > authentication/Admin/signature

							echo "signed certificate" > authentication/Admin/certificate



					Changing a BIOS setting:

						echo <signature> > authentication/Admin/signature

						echo <save signature> > authentication/Admin/save_signature

						Removing the installed certificate::



							echo "signature" > authentication/Admin/signature

							echo "" > authentication/Admin/certificate



						Changing a BIOS setting::



							echo "signature" > authentication/Admin/signature

							echo "save signature" > authentication/Admin/save_signature

							echo Enable > attribute/PasswordBeep/current_value



					You cannot enable certificate authentication if a supervisor password
@@ -288,9 +291,10 @@ Description: 
		certificate_to_password:

					Write only attribute used to switch from certificate based authentication

					back to password based.

					Usage:

						echo <signature> > authentication/Admin/signature

						echo <password> > authentication/Admin/certificate_to_password

					Usage::



						echo "signature" > authentication/Admin/signature

						echo "password" > authentication/Admin/certificate_to_password





What:		/sys/class/firmware-attributes/*/attributes/pending_reboot
@@ -345,7 +349,7 @@ Description: 


		    # echo "factory" > /sys/class/firmware-attributes/*/device/attributes/reset_bios

		    # cat /sys/class/firmware-attributes/*/device/attributes/reset_bios

		    # builtinsafe lastknowngood [factory] custom

		    builtinsafe lastknowngood [factory] custom



		Note that any changes to this attribute requires a reboot

		for changes to take effect.

Documentation/ABI/testing/sysfs-driver-intel_sdsi

+10 −8
Original line number Diff line number Diff line
@@ -13,8 +13,9 @@ Description: 
		Should the operation fail, one of the following error codes

		may be returned:



		==========	=====

		Error Code	Cause

	        ----------	-----

		==========	=====

		EIO		General mailbox failure. Log may indicate cause.

		EBUSY		Mailbox is owned by another agent.

		EPERM		SDSI capability is not enabled in hardware.
@@ -24,6 +25,7 @@ Description: 
				exceeds what may be written.

		ESPIPE		Seeking is not allowed.

		ETIMEDOUT	Failure to complete mailbox transaction in time.

		==========	=====



What:		/sys/bus/auxiliary/devices/intel_vsec.sdsi.X/guid

Date:		Feb 2022

Documentation/ABI/testing/sysfs-fs-erofs

+3 −2
Original line number Diff line number Diff line
@@ -9,8 +9,9 @@ Description: Shows all enabled kernel features. 
What:		/sys/fs/erofs/<disk>/sync_decompress

Date:		November 2021

Contact:	"Huang Jianan" <huangjianan@oppo.com>

Description:	Control strategy of sync decompression

Description:	Control strategy of sync decompression:



		- 0 (default, auto): enable for readpage, and enable for

				     readahead on atomic contexts only,

		  readahead on atomic contexts only.

		- 1 (force on): enable for readpage and readahead.

		- 2 (force off): disable for all situations.

Documentation/arm64/memory-tagging-extension.rst

+2 −2
Original line number Diff line number Diff line
@@ -228,10 +228,10 @@ Core dump support 
-----------------



The allocation tags for user memory mapped with ``PROT_MTE`` are dumped

in the core file as additional ``PT_ARM_MEMTAG_MTE`` segments. The

in the core file as additional ``PT_AARCH64_MEMTAG_MTE`` segments. The

program header for such segment is defined as:



:``p_type``: ``PT_ARM_MEMTAG_MTE``

:``p_type``: ``PT_AARCH64_MEMTAG_MTE``

:``p_flags``: 0

:``p_offset``: segment file offset

:``p_vaddr``: segment virtual address, same as the corresponding