Commit 1887bf5c authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'zonefs-5.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs

Pull zonefs fixes from Damien Le Moal:
 "One fix and one trivial update for rc6:

   - Add MODULE_ALIAS_FS to get automatic module loading on mount
     (Naohiro)

   - Update Damien's email address in the MAINTAINERS file (me)"

* tag 'zonefs-5.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs:
  MAITAINERS: Change zonefs maintainer email address
  zonefs: add MODULE_ALIAS_FS
parents 5d65f6f3 bce472f9
...@@ -21059,7 +21059,7 @@ S: Maintained ...@@ -21059,7 +21059,7 @@ S: Maintained
F: arch/x86/kernel/cpu/zhaoxin.c F: arch/x86/kernel/cpu/zhaoxin.c
ZONEFS FILESYSTEM ZONEFS FILESYSTEM
M: Damien Le Moal <damien.lemoal@wdc.com> M: Damien Le Moal <damien.lemoal@opensource.wdc.com>
M: Naohiro Aota <naohiro.aota@wdc.com> M: Naohiro Aota <naohiro.aota@wdc.com>
R: Johannes Thumshirn <jth@kernel.org> R: Johannes Thumshirn <jth@kernel.org>
L: linux-fsdevel@vger.kernel.org L: linux-fsdevel@vger.kernel.org
......
...@@ -1787,5 +1787,6 @@ static void __exit zonefs_exit(void) ...@@ -1787,5 +1787,6 @@ static void __exit zonefs_exit(void)
MODULE_AUTHOR("Damien Le Moal"); MODULE_AUTHOR("Damien Le Moal");
MODULE_DESCRIPTION("Zone file system for zoned block devices"); MODULE_DESCRIPTION("Zone file system for zoned block devices");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_FS("zonefs");
module_init(zonefs_init); module_init(zonefs_init);
module_exit(zonefs_exit); module_exit(zonefs_exit);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment