diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-09 12:41:00 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-09 12:41:00 -0800 |
commit | 5586c3c1e0eb04cb8b16684aef779e019c8cc64e (patch) | |
tree | 0d078e7c8b0be264016e6fa1ed49e68f17e754bb /MAINTAINERS | |
parent | 1a2a76c2685a29e46d7b37e752ccea7b15aa8e24 (diff) | |
parent | 0fd169576648452725fa2949bf391d10883d3991 (diff) |
Merge branch 'work.vboxsf' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f74871a22c42..575d386e6583 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17791,6 +17791,12 @@ F: include/linux/vbox_utils.h F: include/uapi/linux/vbox*.h F: drivers/virt/vboxguest/ +VIRTUAL BOX SHARED FOLDER VFS DRIVER: +M: Hans de Goede <hdegoede@redhat.com> +L: linux-fsdevel@vger.kernel.org +S: Maintained +F: fs/vboxsf/* + VIRTUAL SERIO DEVICE DRIVER M: Stephen Chandler Paul <thatslyude@gmail.com> S: Maintained |