linux-next: manual merge of the vfs-brauner tree with the origin tree

[Mark Brown]

Hi all,

Today's linux-next merge of the vfs-brauner tree got conflicts in:

  tools/testing/selftests/filesystems/Makefile
  tools/testing/selftests/filesystems/.gitignore

between commit:

  d943e68edc5cb ("selftests/filesystems: test O_TMPFILE creation on idmapped mounts")

from the origin tree and commit:

  a21db4dcaf4ad ("selftests/filesystems: add ustat() coverage")

from the vfs-brauner 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 --cc tools/testing/selftests/filesystems/.gitignore
index a78f894157de3,1bd53d54553c1..0000000000000
--- a/tools/testing/selftests/filesystems/.gitignore
+++ b/tools/testing/selftests/filesystems/.gitignore
@@@ -5,4 -5,4 +5,5 @@@ fclo
  file_stressor
  anon_inode_test
  kernfs_test
 +idmapped_tmpfile
+ ustat_test
diff --cc tools/testing/selftests/filesystems/Makefile
index a7ec2ba2dd833,bbdd40b167fac..0000000000000
--- a/tools/testing/selftests/filesystems/Makefile
+++ b/tools/testing/selftests/filesystems/Makefile
@@@ -1,8 -1,7 +1,8 @@@
  # SPDX-License-Identifier: GPL-2.0
  
  CFLAGS += $(KHDR_INCLUDES)
- TEST_GEN_PROGS := devpts_pts file_stressor anon_inode_test kernfs_test fclog
+ TEST_GEN_PROGS := devpts_pts file_stressor anon_inode_test kernfs_test fclog ustat_test
 +TEST_GEN_PROGS += idmapped_tmpfile
  TEST_GEN_PROGS_EXTENDED := dnotify_test
  
  include ../lib.mk

Attachment: signature.asc
Description: PGP signature