diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-21 09:50:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-21 09:50:18 -0800 |
| commit | c01f664e4ca210823b7594b50669bbd9b0a3c3b0 (patch) | |
| tree | a628328f90d9696b55606a89758c1d41ffaa9609 /arch/um | |
| parent | 597861d6cd343a6ded4cf0302f6fc25ec548e1cc (diff) | |
| parent | fb6f20ecb121cef4d7946f834a6ee867c4e21b4a (diff) | |
Merge tag 'reiserfs_delete' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull reiserfs removal from Jan Kara:
"The deprecation period of reiserfs is ending at the end of this year
so it is time to remove it"
* tag 'reiserfs_delete' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
reiserfs: The last commit
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/configs/i386_defconfig | 1 | ||||
| -rw-r--r-- | arch/um/configs/x86_64_defconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/um/configs/i386_defconfig b/arch/um/configs/i386_defconfig index e543cbac8792..9c9c77f1255a 100644 --- a/arch/um/configs/i386_defconfig +++ b/arch/um/configs/i386_defconfig @@ -61,7 +61,6 @@ CONFIG_UML_NET_DAEMON=y CONFIG_UML_NET_MCAST=y CONFIG_UML_NET_SLIRP=y CONFIG_EXT4_FS=y -CONFIG_REISERFS_FS=y CONFIG_QUOTA=y CONFIG_AUTOFS_FS=m CONFIG_ISO9660_FS=m diff --git a/arch/um/configs/x86_64_defconfig b/arch/um/configs/x86_64_defconfig index 939cb12318ca..03b10d3f6816 100644 --- a/arch/um/configs/x86_64_defconfig +++ b/arch/um/configs/x86_64_defconfig @@ -59,7 +59,6 @@ CONFIG_UML_NET_DAEMON=y CONFIG_UML_NET_MCAST=y CONFIG_UML_NET_SLIRP=y CONFIG_EXT4_FS=y -CONFIG_REISERFS_FS=y CONFIG_QUOTA=y CONFIG_AUTOFS_FS=m CONFIG_ISO9660_FS=m |