Commit f85142af authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.12-rc4 into usb-next



We need the usb/thunderbolt fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents e00943e9 0d02ec6b
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ Contact: xfs@oss.sgi.com
Description:
		The current state of the log write grant head. It
		represents the total log reservation of all currently
		oustanding transactions, including regrants due to
		outstanding transactions, including regrants due to
		rolling transactions. The grant head is exported in
		"cycle:bytes" format.
Users:		xfstests
+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ properties:
      - fsl,vf610-spdif
      - fsl,imx6sx-spdif
      - fsl,imx8qm-spdif
      - fsl,imx8qxp-spdif
      - fsl,imx8mq-spdif
      - fsl,imx8mm-spdif
      - fsl,imx8mn-spdif

  reg:
    maxItems: 1
+6 −3
Original line number Diff line number Diff line
@@ -1495,7 +1495,8 @@ Fails if any VCPU has already been created.

Define which vcpu is the Bootstrap Processor (BSP).  Values are the same
as the vcpu id in KVM_CREATE_VCPU.  If this ioctl is not called, the default
is vcpu 0.
is vcpu 0. This ioctl has to be called before vcpu creation,
otherwise it will return EBUSY error.


4.42 KVM_GET_XSAVE
@@ -4806,8 +4807,10 @@ If an MSR access is not permitted through the filtering, it generates a
allows user space to deflect and potentially handle various MSR accesses
into user space.

If a vCPU is in running state while this ioctl is invoked, the vCPU may
experience inconsistent filtering behavior on MSR accesses.
Note, invoking this ioctl with a vCPU is running is inherently racy.  However,
KVM does guarantee that vCPUs will see either the previous filter or the new
filter, e.g. MSRs with identical settings in both the old and new filter will
have deterministic behavior.

4.127 KVM_XEN_HVM_SET_ATTR
--------------------------
+3 −4
Original line number Diff line number Diff line
@@ -1181,7 +1181,7 @@ M: Joel Fernandes <joel@joelfernandes.org>
M:	Christian Brauner <christian@brauner.io>
M:	Hridya Valsaraju <hridya@google.com>
M:	Suren Baghdasaryan <surenb@google.com>
L:	devel@driverdev.osuosl.org
L:	linux-kernel@vger.kernel.org
S:	Supported
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
F:	drivers/android/
@@ -8116,7 +8116,6 @@ F: drivers/crypto/hisilicon/sec2/sec_main.c
HISILICON STAGING DRIVERS FOR HIKEY 960/970
M:	Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
L:	devel@driverdev.osuosl.org
S:	Maintained
F:	drivers/staging/hikey9xx/
@@ -17040,7 +17039,7 @@ F: drivers/staging/vt665?/
STAGING SUBSYSTEM
M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
L:	devel@driverdev.osuosl.org
L:	linux-staging@lists.linux.dev
S:	Supported
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
F:	drivers/staging/
@@ -19135,7 +19134,7 @@ VME SUBSYSTEM
M:	Martyn Welch <martyn@welchs.me.uk>
M:	Manohar Vanga <manohar.vanga@gmail.com>
M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
L:	devel@driverdev.osuosl.org
L:	linux-kernel@vger.kernel.org
S:	Maintained
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
F:	Documentation/driver-api/vme.rst
+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
VERSION = 5
PATCHLEVEL = 12
SUBLEVEL = 0
EXTRAVERSION = -rc3
EXTRAVERSION = -rc4
NAME = Frozen Wasteland

# *DOCUMENTATION*
Loading