Merge branch 'work.vboxsf' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Feb 2020 20:41:00 +0000 (12:41 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Feb 2020 20:41:00 +0000 (12:41 -0800)
commit5586c3c1e0eb04cb8b16684aef779e019c8cc64e
tree0d078e7c8b0be264016e6fa1ed49e68f17e754bb
parent1a2a76c2685a29e46d7b37e752ccea7b15aa8e24
parent0fd169576648452725fa2949bf391d10883d3991
Merge branch 'work.vboxsf' of git://git./linux/kernel/git/viro/vfs

Pull vboxfs from Al Viro:
 "This is the VirtualBox guest shared folder support by Hans de Goede,
  with fixups for fs_parse folded in to avoid bisection hazards from
  those API changes..."

* 'work.vboxsf' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs: Add VirtualBox guest shared folder (vboxsf) support
MAINTAINERS
fs/Makefile