Commit de800f29 authored Apr 05, 2021 by Greg Kroah-Hartman

Merge 5.12-rc6 into usb-next



We want the USB fixes in here as well and it resolves a merge issue with
xhci-mtk.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parents bee1f89a e49d033b

.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/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/networking/device_drivers/ethernet/amazon/ena.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -267,7 +267,7 @@ DATA PATH
		Tx
		--

		end_start_xmit() is called by the stack. This function does the following:
		ena_start_xmit() is called by the stack. This function does the following:

		- Maps data buffers (skb->data and frags).
		- Populates ena_buf for the push buffer (if the driver and device are

Documentation/networking/devlink/devlink-dpipe.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ purposes as a standard complementary tool. The system's view from
		``devlink-dpipe`` should change according to the changes done by the
		standard configuration tools.

		For example, it’s quiet common to implement Access Control Lists (ACL)
		For example, it’s quite common to implement Access Control Lists (ACL)
		using Ternary Content Addressable Memory (TCAM). The TCAM memory can be
		divided into TCAM regions. Complex TC filters can have multiple rules with
		different priorities and different lookup keys. On the other hand hardware