Merge tag 'vfs-6.13.exportfs' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

Pull vfs exportfs updates from Christian Brauner:
 "This contains work to bring NFS connectable file handles to userspace
  servers.

  The name_to_handle_at() system call is extended to encode connectable
  file handles. Such file handles can be resolved to an open file with a
  connected path. So far userspace NFS servers couldn't make use of this
  functionality even though the kernel does already support it. This is
  achieved by introducing a new flag for name_to_handle_at().

  Similarly, the open_by_handle_at() system call is tought to understand
  connectable file handles explicitly created via name_to_handle_at()"

* tag 'vfs-6.13.exportfs' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
  fs: open_by_handle_at() support for decoding "explicit connectable" file handles
  fs: name_to_handle_at() support for "explicit connectable" file handles
  fs: prepare for "explicit connectable" file handles

diff --cc fs/fhandle.c
Simple merge

diff --cc include/linux/exportfs.h
Simple merge

diff --cc include/uapi/linux/fcntl.h
index a40833bf2855e3a781abe548f8e8a47861c66e2e,56ff2100e0216c5f987224adae00fbf3f67ddc5c..6e6907e63bfc2b4d0bbdcf1db6738fa3015aaeec
--- 1/include/uapi/linux/fcntl.h
--- 2/include/uapi/linux/fcntl.h
+++ b/include/uapi/linux/fcntl.h
@@@ -153,5 -153,10 +153,6 @@@
                                           object identity and may not be
                                           usable with open_by_handle_at(2). */
  #define AT_HANDLE_MNT_ID_UNIQUE       0x001   /* Return the u64 unique mount ID. */
+ #define AT_HANDLE_CONNECTABLE 0x002   /* Request a connectable file handle */
  
 -#if defined(__KERNEL__)
 -#define AT_GETATTR_NOSEC      0x80000000
 -#endif
 -
  #endif /* _UAPI_LINUX_FCNTL_H */