summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-11-21 09:50:18 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2024-11-21 09:50:18 -0800
commitc01f664e4ca210823b7594b50669bbd9b0a3c3b0 (patch)
treea628328f90d9696b55606a89758c1d41ffaa9609 /Documentation
parent597861d6cd343a6ded4cf0302f6fc25ec548e1cc (diff)
parentfb6f20ecb121cef4d7946f834a6ee867c4e21b4a (diff)
downloadlinux-c01f664e4ca210823b7594b50669bbd9b0a3c3b0.tar.gz
linux-c01f664e4ca210823b7594b50669bbd9b0a3c3b0.tar.bz2
linux-c01f664e4ca210823b7594b50669bbd9b0a3c3b0.zip
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 'Documentation')
-rw-r--r--Documentation/filesystems/porting.rst2
-rw-r--r--Documentation/userspace-api/ioctl/ioctl-number.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/filesystems/porting.rst b/Documentation/filesystems/porting.rst
index 92bffcc6747a..9ab2a3d6f2b4 100644
--- a/Documentation/filesystems/porting.rst
+++ b/Documentation/filesystems/porting.rst
@@ -177,7 +177,7 @@ settles down a bit.
**mandatory**
s_export_op is now required for exporting a filesystem.
-isofs, ext2, ext3, reiserfs, fat
+isofs, ext2, ext3, fat
can be used as examples of very different filesystems.
---
diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst
index e4be1378ba26..243f1f1b554a 100644
--- a/Documentation/userspace-api/ioctl/ioctl-number.rst
+++ b/Documentation/userspace-api/ioctl/ioctl-number.rst
@@ -375,7 +375,7 @@ Code Seq# Include File Comments
0xCB 00-1F CBM serial IEC bus in development:
<mailto:michael.klein@puffin.lb.shuttle.de>
0xCC 00-0F drivers/misc/ibmvmc.h pseries VMC driver
-0xCD 01 linux/reiserfs_fs.h
+0xCD 01 linux/reiserfs_fs.h Dead since 6.13
0xCE 01-02 uapi/linux/cxl_mem.h Compute Express Link Memory Devices
0xCF 02 fs/smb/client/cifs_ioctl.h
0xDB 00-0F drivers/char/mwave/mwavepub.h