From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Feb 2023 17:53:58 +0000 (-0800)
Subject: Merge tag 'fuse-update-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi... 
X-Git-Tag: v6.6.17~5409
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d40b2f4c94f221bd5aab205f945e6f88d3df0929;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'fuse-update-6.3' of git://git./linux/kernel/git/mszeredi/fuse

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
---

d40b2f4c94f221bd5aab205f945e6f88d3df0929
diff --cc fs/fuse/file.c
index ff0b3ef,3eb28aa..de37a3a
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@@ -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,