Merge tag 'fuse-update-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Feb 2023 17:53:58 +0000 (09:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Feb 2023 17:53:58 +0000 (09:53 -0800)
Pull fuse updates from Miklos Szeredi:

 - Fix regression in fileattr permission checking

 - Fix possible hang during PID namespace destruction

 - Add generic support for request extensions

 - Add supplementary group list extension

 - Add limited support for supplying supplementary groups in create
   requests

 - Documentation fixes

* tag 'fuse-update-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: add inode/permission checks to fileattr_get/fileattr_set
  fuse: fix all W=1 kernel-doc warnings
  fuse: in fuse_flush only wait if someone wants the return code
  fuse: optional supplementary group in create requests
  fuse: add request extension

1  2 
fs/fuse/dir.c
fs/fuse/file.c
fs/fuse/fuse_i.h
fs/fuse/inode.c
fs/fuse/ioctl.c

diff --cc fs/fuse/dir.c
Simple merge
diff --cc fs/fuse/file.c
index ff0b3ef774d492cbc3bb891d757cc895152cc8fc,3eb28aad56742fd2c11d1a818a55dedb8c99bced..de37a3a06a7169c628de17abe08ed14b56335108
@@@ -18,7 -18,7 +18,8 @@@
  #include <linux/falloc.h>
  #include <linux/uio.h>
  #include <linux/fs.h>
 +#include <linux/filelock.h>
+ #include <linux/file.h>
  
  static int fuse_send_open(struct fuse_mount *fm, u64 nodeid,
                          unsigned int open_flags, int opcode,
Simple merge
diff --cc fs/fuse/inode.c
Simple merge
diff --cc fs/fuse/ioctl.c
Simple merge