Commit 629b9111 authored Sep 21, 2020 by Greg Kroah-Hartman

Merge 5.0-rc6 into usb-next



We want the USB fixes in here, and this resolves a merge issue in the
uas driver.

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

parents 673d7468 ba4f184e

.mailmap

+4 −0

Original line number	Diff line number	Diff line
		@@ -169,6 +169,10 @@ Juha Yrjola <juha.yrjola@solidboot.com>
		Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
		Kamil Konieczny <k.konieczny@samsung.com> <k.konieczny@partner.samsung.com>
		Kay Sievers <kay.sievers@vrfy.org>
		Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>
		Kees Cook <keescook@chromium.org> <keescook@google.com>
		Kees Cook <keescook@chromium.org> <kees@outflux.net>
		Kees Cook <keescook@chromium.org> <kees@ubuntu.com>
		Kenneth W Chen <kenneth.w.chen@intel.com>
		Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>
		Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

Documentation/features/debug/debug-vm-pgtable/arch-support.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@
		\| nios2: \| TODO \|
		\| openrisc: \| TODO \|
		\| parisc: \| TODO \|
		\| powerpc: \| ok \|
		\| powerpc: \| TODO \|
		\| riscv: \| ok \|
		\| s390: \| ok \|
		\| sh: \| TODO \|

MAINTAINERS

+2 −2

Original line number	Diff line number	Diff line
		@@ -6180,7 +6180,7 @@ F: Documentation/devicetree/bindings/edac/aspeed-sdram-edac.txt
		F: drivers/edac/aspeed_edac.c

		EDAC-BLUEFIELD
		M: Shravan Kumar Ramani <sramani@nvidia.com>
		M: Shravan Kumar Ramani <shravankr@nvidia.com>
		S: Supported
		F: drivers/edac/bluefield_edac.c

		@@ -9251,7 +9251,7 @@ F: drivers/firmware/iscsi_ibft*

		ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
		M: Sagi Grimberg <sagi@grimberg.me>
		M: Max Gurtovoy <maxg@nvidia.com>
		M: Max Gurtovoy <mgurtovoy@nvidia.com>
		L: linux-rdma@vger.kernel.org
		S: Supported
		W: http://www.openfabrics.org

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		VERSION = 5
		PATCHLEVEL = 9
		SUBLEVEL = 0
		EXTRAVERSION = -rc5
		EXTRAVERSION = -rc6
		NAME = Kleptomaniac Octopus

		# DOCUMENTATION

arch/arm64/kernel/cpu_errata.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -910,8 +910,12 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
		.desc = "ARM erratum 1418040",
		.capability = ARM64_WORKAROUND_1418040,
		ERRATA_MIDR_RANGE_LIST(erratum_1418040_list),
		.type = (ARM64_CPUCAP_SCOPE_LOCAL_CPU \|
		ARM64_CPUCAP_PERMITTED_FOR_LATE_CPU),
		/*
		* We need to allow affected CPUs to come in late, but
		* also need the non-affected CPUs to be able to come
		* in at any point in time. Wonderful.
		*/
		.type = ARM64_CPUCAP_WEAK_LOCAL_CPU_FEATURE,
		},
		#endif
		#ifdef CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT