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

[Mark Brown]

Hi all,

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

  tools/testing/selftests/filesystems/fuse/.gitignore

between commit:

  ea1302e285ed7 ("selftests/filesystems: test walks racing the unlink of covered names")

from the vfs-brauner-fixes tree and commit:

  a6ca1a573e1fd ("selftests/fuse: add test for FUSE_HAS_SYNCFS privilege gating")

from the fuse 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/fuse/.gitignore
index 59739a6e5b99b,b5b03db1118ce..0000000000000
--- a/tools/testing/selftests/filesystems/fuse/.gitignore
+++ b/tools/testing/selftests/filesystems/fuse/.gitignore
@@@ -1,5 -1,5 +1,6 @@@
  # SPDX-License-Identifier: GPL-2.0-only
  fuse_mnt
  fusectl_test
+ test_syncfs
 +unlink_reval_test
  write_extend_eof_test

Attachment: signature.asc
Description: PGP signature