From: Will Deacon <will@kernel.org>
Date: Wed, 7 Oct 2020 13:36:24 +0000 (+0100)
Subject: Merge branch 'for-next/late-arrivals' into for-next/core
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a82e4ef0417b89c6707706b9194fb0c7872a4c6a;p=linux.git

Merge branch 'for-next/late-arrivals' into for-next/core

Late patches for 5.10: MTE selftests, minor KCSAN preparation and removal
of some unused prototypes.

(Amit Daniel Kachhap and others)
* for-next/late-arrivals:
  arm64: random: Remove no longer needed prototypes
  arm64: initialize per-cpu offsets earlier
  kselftest/arm64: Check mte tagged user address in kernel
  kselftest/arm64: Verify KSM page merge for MTE pages
  kselftest/arm64: Verify all different mmap MTE options
  kselftest/arm64: Check forked child mte memory accessibility
  kselftest/arm64: Verify mte tag inclusion via prctl
  kselftest/arm64: Add utilities and a test to validate mte memory
---

a82e4ef0417b89c6707706b9194fb0c7872a4c6a
diff --cc tools/testing/selftests/arm64/Makefile
index 463d56278f8f9,3723d9dea11a4..2c9d012797a7f
--- a/tools/testing/selftests/arm64/Makefile
+++ b/tools/testing/selftests/arm64/Makefile
@@@ -4,7 -4,7 +4,7 @@@
  ARCH ?= $(shell uname -m 2>/dev/null || echo not)
  
  ifneq (,$(filter $(ARCH),aarch64 arm64))
- ARM64_SUBTARGETS ?= tags signal pauth fp
 -ARM64_SUBTARGETS ?= tags signal mte
++ARM64_SUBTARGETS ?= tags signal pauth fp mte
  else
  ARM64_SUBTARGETS :=
  endif