diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-11-05 10:11:53 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-11-05 10:11:53 +0100 |
commit | 09fbb82f9413641cbb6b3fc4970ed4ff6d2a2c2a (patch) | |
tree | 886c21539f1df24a14175997dc045715cd1d25e2 /Documentation/filesystems/netfs_library.rst | |
parent | driver core: constify devlink class (diff) | |
parent | Linux 6.12-rc6 (diff) | |
download | linux-09fbb82f9413641cbb6b3fc4970ed4ff6d2a2c2a.tar.xz linux-09fbb82f9413641cbb6b3fc4970ed4ff6d2a2c2a.zip |
Merge 6.12-rc6 into driver-core-next
We need the driver-core fix/revert in here as well to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/filesystems/netfs_library.rst')
-rw-r--r-- | Documentation/filesystems/netfs_library.rst | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/filesystems/netfs_library.rst b/Documentation/filesystems/netfs_library.rst index f0d2cb257bb8..73f0bfd7e903 100644 --- a/Documentation/filesystems/netfs_library.rst +++ b/Documentation/filesystems/netfs_library.rst @@ -592,4 +592,3 @@ API Function Reference .. kernel-doc:: include/linux/netfs.h .. kernel-doc:: fs/netfs/buffered_read.c -.. kernel-doc:: fs/netfs/io.c |