diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-12-17 17:19:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-12-17 17:19:51 -0800 |
| commit | 1887bf5cc4954d93c06cb0d6a8242fe7f00b4584 (patch) | |
| tree | 9f432b417b63068c452e74250dee10cf6d9b44cd | |
| parent | 5d65f6f3df56021ec76761ea6986bc8139f537d2 (diff) | |
| parent | bce472f90952cc8be03dded25c4aa109d27e5924 (diff) | |
| download | linux-1887bf5cc4954d93c06cb0d6a8242fe7f00b4584.tar.bz2 | |
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
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | fs/zonefs/super.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8b7a98daf8e0..8912b2c1260c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21059,7 +21059,7 @@ S: Maintained F: arch/x86/kernel/cpu/zhaoxin.c 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> R: Johannes Thumshirn <jth@kernel.org> L: linux-fsdevel@vger.kernel.org diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c index 259ee2bda492..b76dfb310ab6 100644 --- a/fs/zonefs/super.c +++ b/fs/zonefs/super.c @@ -1787,5 +1787,6 @@ static void __exit zonefs_exit(void) MODULE_AUTHOR("Damien Le Moal"); MODULE_DESCRIPTION("Zone file system for zoned block devices"); MODULE_LICENSE("GPL"); +MODULE_ALIAS_FS("zonefs"); module_init(zonefs_init); module_exit(zonefs_exit); |