Merge tag 'virtio-fs-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

Pull fuse virtio-fs support from Miklos Szeredi:
 "Virtio-fs allows exporting directory trees on the host and mounting
  them in guest(s).

  This isn't actually a new filesystem, but a glue layer between the
  fuse filesystem and a virtio based back-end.

  It's similar in functionality to the existing virtio-9p solution, but
  significantly faster in benchmarks and has better POSIX compliance.
  Further permformance improvements can be achieved by sharing the page
  cache between host and guest, allowing for faster I/O and reduced
  memory use.

  Kata Containers have been including the out-of-tree virtio-fs (with
  the shared page cache patches as well) since version 1.7 as an
  experimental feature. They have been active in development and plan to
  switch from virtio-9p to virtio-fs as their default solution. There
  has been interest from other sources as well.

  The userspace infrastructure is slated to be merged into qemu once the
  kernel part hits mainline.

  This was developed by Vivek Goyal, Dave Gilbert and Stefan Hajnoczi"

* tag 'virtio-fs-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  virtio-fs: add virtiofs filesystem
  virtio-fs: add Documentation/filesystems/virtiofs.rst
  fuse: reserve values for mapping protocol

diff --cc Documentation/filesystems/index.rst
index fd2bcf99cda0aabb88fed924bcaddc48e39a4c8f,56e94bfc580fff532f9dd05f3c0d5c5d416a47a0..2c3a9f761205e8ba2624d0de10f9b98916bfbd56
--- 1/Documentation/filesystems/index.rst
--- 2/Documentation/filesystems/index.rst
+++ b/Documentation/filesystems/index.rst
@@@ -36,4 -32,13 +36,14 @@@ filesystem implementations
  
     journalling
     fscrypt
 +   fsverity
+ 
+ Filesystems
+ ===========
+ 
+ Documentation for filesystem implementations.
+ 
+ .. toctree::
+    :maxdepth: 2
+ 
+    virtiofs

diff --cc MAINTAINERS
Simple merge

diff --cc fs/fuse/inode.c
Simple merge