linux-next: manual merge of the sh tree with the mm-unstable tree

[broonie]

Hi all,

Today's linux-next merge of the sh tree got a conflict in:

  tools/testing/selftests/mm/Makefile

between commit:

  aaf87fd8703a5 ("selftests/mm: use TEST_GEN_PROGS where proper")

from the mm-unstable tree and commit:

  644a9cf0d2a83 ("sh: remove sh5/sh64 last fragments")

from the sh tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile
index a913397c6b3c5..3ad614d359e44 100644
--- a/tools/testing/selftests/mm/Makefile
+++ b/tools/testing/selftests/mm/Makefile
@@ -93,7 +93,7 @@ endif
 
 endif
 
-ifneq (,$(filter $(MACHINE),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sh64 sparc64 x86_64))
+ifneq (,$(filter $(MACHINE),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sparc64 x86_64))
 TEST_GEN_PROGS += va_high_addr_switch
 TEST_GEN_PROGS += virtual_address_range
 TEST_GEN_PROGS += write_to_hugetlbfs