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/

diff --cc Documentation/admin-guide/index.rst
index 280355d08af5a39178cba6dfc63f27e55e0f1abf,3c18ba7912a7e2c04a5f035b12be136bd001bfad..33feab2f40840c426f55a545c14ede4e6a079b5c
--- 1/Documentation/admin-guide/index.rst
--- 2/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

diff --cc MAINTAINERS
Simple merge