linux-next: manual merge of the mm-nonmm-unstable tree with the vfs-brauner-fixes tree

Posted by Mark Brown 1 day, 2 hours ago
Hi all,

Today's linux-next merge of the mm-nonmm-unstable tree got a conflict in:

  tools/testing/selftests/Makefile

between commit:

  76ebb69da677d ("Revert "selftests/filesystems: add mntns cleanup test"")

from the vfs-brauner-fixes tree and commit:

  73bdd88ca86eb ("selftests/filesystems: fix missing and stale TARGETS entries")

from the mm-nonmm-unstable 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 --combined tools/testing/selftests/Makefile
index 273853937c254,330d061f6366f..0000000000000
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@@ -49,6 -49,7 +49,6 @@@ TARGETS += filesystems/move_moun
  TARGETS += filesystems/empty_mntns
  TARGETS += filesystems/fsmount_ns
  TARGETS += filesystems/fscontext_ns
 -TARGETS += filesystems/mntns_cleanup
  TARGETS += filesystems/xattr
  TARGETS += firmware
  TARGETS += fpu