Merge tag 'kvmarm-fixes-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmar...

[tomoyo/tomoyo-test1.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c74e4ea..38fe2f3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13360,7 +13360,7 @@ S:      Maintained
 F:     fs/timerfd.c
 F:     include/linux/timer*
 F:     include/linux/time_namespace.h
-F:     kernel/time_namespace.c
+F:     kernel/time/namespace.c
 F:     kernel/time/*timer*
 
 POWER MANAGEMENT CORE
@@ -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
@@ -18490,6 +18496,16 @@ L:     linux-kernel@vger.kernel.org
 S:     Maintained
 F:     arch/x86/kernel/cpu/zhaoxin.c
 
+ZONEFS FILESYSTEM
+M:     Damien Le Moal <damien.lemoal@wdc.com>
+M:     Naohiro Aota <naohiro.aota@wdc.com>
+R:     Johannes Thumshirn <jth@kernel.org>
+L:     linux-fsdevel@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git
+S:     Maintained
+F:     fs/zonefs/
+F:     Documentation/filesystems/zonefs.txt
+
 ZPOOL COMPRESSED PAGE STORAGE API
 M:     Dan Streetman <ddstreet@ieee.org>
 L:     linux-mm@kvack.org