From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Jul 2019 18:18:00 +0000 (-0700)
Subject: Merge tag 'xfs-5.3-merge-13' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
X-Git-Tag: v5.3-rc1~41
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=366a4e38b8d0d3e8c7673ab5c1b5e76bbfbc0085;p=users%2Fjedix%2Flinux-maple.git

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/
---

366a4e38b8d0d3e8c7673ab5c1b5e76bbfbc0085
diff --cc Documentation/admin-guide/index.rst
index 280355d08af5,3c18ba7912a7..33feab2f4084
--- a/Documentation/admin-guide/index.rst
+++ b/Documentation/admin-guide/index.rst
@@@ -74,9 -69,8 +74,10 @@@ configure specific aspects of kernel be
     java
     ras
     bcache
 +   blockdev/index
     ext4
 +   binderfs
+    xfs
     pm/index
     thunderbolt
     LSM/index