Commit e855e80d authored Apr 02, 2021 by Ingo Molnar

Merge tag 'v5.12-rc5' into WIP.x86/core, to pick up recent NOP related changes



In particular we want to have this upstream commit:

  b9082970: ("bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG")

... before merging in x86/cpu changes and the removal of the NOP optimizations, and
applying PeterZ's !retpoline objtool series.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

parents f2ac256b a5e13c6d

.mailmap

+3 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ Andrew Morton <akpm@linux-foundation.org>
		Andrew Murray <amurray@thegoodpenguin.co.uk> <amurray@embedded-bits.co.uk>
		Andrew Murray <amurray@thegoodpenguin.co.uk> <andrew.murray@arm.com>
		Andrew Vasquez <andrew.vasquez@qlogic.com>
		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>
		Andy Adamson <andros@citi.umich.edu>
		@@ -65,6 +66,8 @@ Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
		Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
		Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
		Chao Yu <chao@kernel.org> <yuchao0@huawei.com>
		Chris Chiu <chris.chiu@canonical.com> <chiu@endlessm.com>
		Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
		Christophe Ricard <christophe.ricard@gmail.com>
		Christoph Hellwig <hch@lst.de>
		Corey Minyard <minyard@acm.org>

Documentation/ABI/testing/sysfs-fs-xfs

+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

Documentation/arm64/acpi_object_usage.rst

+5 −5

Original line number	Diff line number	Diff line
		@@ -17,12 +17,12 @@ For ACPI on arm64, tables also fall into the following categories:

		- Recommended: BERT, EINJ, ERST, HEST, PCCT, SSDT

		- Optional: BGRT, CPEP, CSRT, DBG2, DRTM, ECDT, FACS, FPDT, IORT,
		MCHI, MPST, MSCT, NFIT, PMTT, RASF, SBST, SLIT, SPMI, SRAT, STAO,
		TCPA, TPM2, UEFI, XENV
		- Optional: BGRT, CPEP, CSRT, DBG2, DRTM, ECDT, FACS, FPDT, IBFT,
		IORT, MCHI, MPST, MSCT, NFIT, PMTT, RASF, SBST, SLIT, SPMI, SRAT,
		STAO, TCPA, TPM2, UEFI, XENV

		- Not supported: BOOT, DBGP, DMAR, ETDT, HPET, IBFT, IVRS, LPIT,
		MSDM, OEMx, PSDT, RSDT, SLIC, WAET, WDAT, WDRT, WPBT
		- Not supported: BOOT, DBGP, DMAR, ETDT, HPET, IVRS, LPIT, MSDM, OEMx,
		PSDT, RSDT, SLIC, WAET, WDAT, WDRT, WPBT

		====== ========================================================================
		Table Usage for ARMv8 Linux

Documentation/arm64/silicon-errata.rst

+3 −0

Original line number	Diff line number	Diff line
		@@ -130,6 +130,9 @@ stable kernels.
		\| Marvell \| ARM-MMU-500 \| #582743 \| N/A \|
		+----------------+-----------------+-----------------+-----------------------------+
		+----------------+-----------------+-----------------+-----------------------------+
		\| NVIDIA \| Carmel Core \| N/A \| NVIDIA_CARMEL_CNP_ERRATUM \|
		+----------------+-----------------+-----------------+-----------------------------+
		+----------------+-----------------+-----------------+-----------------------------+
		\| Freescale/NXP \| LS2080A/LS1043A \| A-008585 \| FSL_ERRATUM_A008585 \|
		+----------------+-----------------+-----------------+-----------------------------+
		+----------------+-----------------+-----------------+-----------------------------+

Documentation/devicetree/bindings/sound/fsl,spdif.yaml

+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