Commit 162e3480 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge tag 'v6.6' into rdma.git for-next 

Resolve conflict by taking the spin_lock hunk from for-next:

 https://lore.kernel.org/r/20230928113851.5197a1ec@canb.auug.org.au



Required for the next patch.

Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parents d4b2d165 ffc25326

.mailmap

+5 −2
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@unisoc.com> 
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang7@gmail.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>

Bartosz Golaszewski <brgl@bgdev.pl> <bgolaszewski@baylibre.com>

Ben Dooks <ben-linux@fluff.org> <ben.dooks@simtec.co.uk>

Ben Dooks <ben-linux@fluff.org> <ben.dooks@sifive.com>

Ben Gardner <bgardner@wabtec.com>
@@ -377,6 +378,7 @@ Matthew Wilcox <willy@infradead.org> <willy@debian.org> 
Matthew Wilcox <willy@infradead.org> <willy@linux.intel.com>

Matthew Wilcox <willy@infradead.org> <willy@parisc-linux.org>

Matthias Fuchs <socketcan@esd.eu> <matthias.fuchs@esd.eu>

Matthieu Baerts <matttbe@kernel.org> <matthieu.baerts@tessares.net>

Matthieu CASTET <castet.matthieu@free.fr>

Matti Vaittinen <mazziesaccount@gmail.com> <matti.vaittinen@fi.rohmeurope.com>

Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
@@ -449,9 +451,10 @@ Oleksandr Natalenko <oleksandr@natalenko.name> <oleksandr@redhat.com> 
Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>

Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>

Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>

Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>

Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>

Oleksij Rempel <o.rempel@pengutronix.de>

Oleksij Rempel <o.rempel@pengutronix.de> <ore@pengutronix.de>

Oliver Upton <oliver.upton@linux.dev> <oupton@google.com>

Ondřej Jirman <megi@xff.cz> <megous@megous.com>

Oza Pawandeep <quic_poza@quicinc.com> <poza@codeaurora.org>

Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

Documentation/ABI/testing/sysfs-class-firmware

+7 −7
Original line number Diff line number Diff line 
What: 		/sys/class/firmware/.../data

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	The data sysfs file is used for firmware-fallback and for

		firmware uploads. Cat a firmware image to this sysfs file

		after you echo 1 to the loading sysfs file. When the firmware
@@ -13,7 +13,7 @@ Description: The data sysfs file is used for firmware-fallback and for 
What: 		/sys/class/firmware/.../cancel

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	Write-only. For firmware uploads, write a "1" to this file to

		request that the transfer of firmware data to the lower-level

		device be canceled. This request will be rejected (EBUSY) if
@@ -23,7 +23,7 @@ Description: Write-only. For firmware uploads, write a "1" to this file to 
What: 		/sys/class/firmware/.../error

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	Read-only. Returns a string describing a failed firmware

		upload. This string will be in the form of <STATUS>:<ERROR>,

		where <STATUS> will be one of the status strings described
@@ -37,7 +37,7 @@ Description: Read-only. Returns a string describing a failed firmware 
What: 		/sys/class/firmware/.../loading

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	The loading sysfs file is used for both firmware-fallback and

		for firmware uploads. Echo 1 onto the loading file to indicate

		you are writing a firmware file to the data sysfs node. Echo
@@ -49,7 +49,7 @@ Description: The loading sysfs file is used for both firmware-fallback and 
What: 		/sys/class/firmware/.../remaining_size

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	Read-only. For firmware upload, this file contains the size

		of the firmware data that remains to be transferred to the

		lower-level device driver. The size value is initialized to
@@ -62,7 +62,7 @@ Description: Read-only. For firmware upload, this file contains the size 
What: 		/sys/class/firmware/.../status

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	Read-only. Returns a string describing the current status of

		a firmware upload. The string will be one of the following:

		idle, "receiving", "preparing", "transferring", "programming".
@@ -70,7 +70,7 @@ Description: Read-only. Returns a string describing the current status of 
What: 		/sys/class/firmware/.../timeout

Date:		July 2022

KernelVersion:	5.19

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Russ Weight <russ.weight@linux.dev>

Description:	This file supports the timeout mechanism for firmware

		fallback.  This file has no affect on firmware uploads. For

		more information on timeouts please see the documentation

Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update

+7 −7
Original line number Diff line number Diff line 
What:		/sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/sr_root_entry_hash

Date:		Sep 2022

KernelVersion:	5.20

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Peter Colberg <peter.colberg@intel.com>

Description:	Read only. Returns the root entry hash for the static

		region if one is programmed, else it returns the

		string: "hash not programmed".  This file is only
@@ -11,7 +11,7 @@ Description: Read only. Returns the root entry hash for the static 
What:		/sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/pr_root_entry_hash

Date:		Sep 2022

KernelVersion:	5.20

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Peter Colberg <peter.colberg@intel.com>

Description:	Read only. Returns the root entry hash for the partial

		reconfiguration region if one is programmed, else it

		returns the string: "hash not programmed".  This file
@@ -21,7 +21,7 @@ Description: Read only. Returns the root entry hash for the partial 
What:		/sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/bmc_root_entry_hash

Date:		Sep 2022

KernelVersion:	5.20

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Peter Colberg <peter.colberg@intel.com>

Description:	Read only. Returns the root entry hash for the BMC image

		if one is programmed, else it returns the string:

		"hash not programmed".  This file is only visible if the
@@ -31,7 +31,7 @@ Description: Read only. Returns the root entry hash for the BMC image 
What:		/sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/sr_canceled_csks

Date:		Sep 2022

KernelVersion:	5.20

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Peter Colberg <peter.colberg@intel.com>

Description:	Read only. Returns a list of indices for canceled code

		signing keys for the static region. The standard bitmap

		list format is used (e.g. "1,2-6,9").
@@ -39,7 +39,7 @@ Description: Read only. Returns a list of indices for canceled code 
What:		/sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/pr_canceled_csks

Date:		Sep 2022

KernelVersion:	5.20

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Peter Colberg <peter.colberg@intel.com>

Description:	Read only. Returns a list of indices for canceled code

		signing keys for the partial reconfiguration region. The

		standard bitmap list format is used (e.g. "1,2-6,9").
@@ -47,7 +47,7 @@ Description: Read only. Returns a list of indices for canceled code 
What:		/sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/bmc_canceled_csks

Date:		Sep 2022

KernelVersion:	5.20

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Peter Colberg <peter.colberg@intel.com>

Description:	Read only. Returns a list of indices for canceled code

		signing keys for the BMC.  The standard bitmap list format

		is used (e.g. "1,2-6,9").
@@ -55,7 +55,7 @@ Description: Read only. Returns a list of indices for canceled code 
What:		/sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/flash_count

Date:		Sep 2022

KernelVersion:	5.20

Contact:	Russ Weight <russell.h.weight@intel.com>

Contact:	Peter Colberg <peter.colberg@intel.com>

Description:	Read only. Returns number of times the secure update

		staging area has been flashed.

		Format: "%u".

Documentation/admin-guide/cgroup-v1/memory.rst

+7 −0
Original line number Diff line number Diff line
@@ -92,6 +92,13 @@ Brief summary of control files. 
 memory.oom_control		     set/show oom controls.

 memory.numa_stat		     show the number of memory usage per numa

				     node

 memory.kmem.limit_in_bytes          Deprecated knob to set and read the kernel

                                     memory hard limit. Kernel hard limit is not

                                     supported since 5.16. Writing any value to

                                     do file will not have any effect same as if

                                     nokmem kernel parameter was specified.

                                     Kernel memory is still charged and reported

                                     by memory.kmem.usage_in_bytes.

 memory.kmem.usage_in_bytes          show current kernel memory allocation

 memory.kmem.failcnt                 show the number of kernel memory usage

				     hits limits

Documentation/arch/arm64/silicon-errata.rst

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A510     | #2658417        | ARM64_ERRATUM_2658417       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A520     | #2966298        | ARM64_ERRATUM_2966298       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A53      | #826319         | ARM64_ERRATUM_826319        |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A53      | #827319         | ARM64_ERRATUM_827319        |