diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-18 20:18:00 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-18 20:18:00 +0200 |
| commit | 366a4e38b8d0d3e8c7673ab5c1b5e76bbfbc0085 (patch) | |
| tree | 7008e59815214b760003707257bd06df46a55a9e /Documentation/admin-guide/index.rst | |
| parent | Merge tag '4.3-rc-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| parent | Documentation: filesystem: Convert xfs.txt to ReST (diff) | |
| download | linux-366a4e38b8d0d3e8c7673ab5c1b5e76bbfbc0085.tar.xz linux-366a4e38b8d0d3e8c7673ab5c1b5e76bbfbc0085.zip | |
Merge tag 'xfs-5.3-merge-13' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull xfs cleanups from Darrick Wong:
"We had a few more lateish cleanup patches come in for 5.3 -- a couple
of syncups with the userspace libxfs code and a conversion of the XFS
administrator's guide to ReST format.
Summary:
- Bring fs/xfs/libxfs/xfs_trans_inode.c in sync with userspace
libxfs.
- Convert the xfs administrator guide to rst and move it into the
official admin guide under Documentation"
* tag 'xfs-5.3-merge-13' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
Documentation: filesystem: Convert xfs.txt to ReST
xfs: sync up xfs_trans_inode with userspace
xfs: move xfs_trans_inode.c to libxfs/
Diffstat (limited to 'Documentation/admin-guide/index.rst')
| -rw-r--r-- | Documentation/admin-guide/index.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/admin-guide/index.rst b/Documentation/admin-guide/index.rst index 280355d08af5..33feab2f4084 100644 --- a/Documentation/admin-guide/index.rst +++ b/Documentation/admin-guide/index.rst @@ -77,6 +77,7 @@ configure specific aspects of kernel behavior to your liking. blockdev/index ext4 binderfs + xfs pm/index thunderbolt LSM/index |