[GIT,PULL] xfs: cleanups for 5.3
mbox series

Message ID 20190718161824.GE7093@magnolia
State New
Headers show
  • [GIT,PULL] xfs: cleanups for 5.3
Related show


git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git tags/xfs-5.3-merge-13


Darrick J. Wong July 18, 2019, 4:18 p.m. UTC
Hi Linus,

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.

The branch does /not/ merge cleanly against this morning's HEAD due to a
conflict in Documentation/admin-guide/index.rst.  The conflict can be
resolved by adding the "xfs" line after "binderfs".  The series survived
an overnight run of xfstests.

Please let me know if you run into anything weird, I promise I drank two
cups of coffee this time around. :)


The following changes since commit 488ca3d8d088ec4658c87aaec6a91e98acccdd54:

  xfs: chain bios the right way around in xfs_rw_bdev (2019-07-10 10:04:16 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git tags/xfs-5.3-merge-13

for you to fetch changes up to 89b408a68b9dd163b2705b6f73d8e3cc3579b457:

  Documentation: filesystem: Convert xfs.txt to ReST (2019-07-15 09:15:09 -0700)

Also new for 5.3:
- 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

Eric Sandeen (2):
      xfs: move xfs_trans_inode.c to libxfs/
      xfs: sync up xfs_trans_inode with userspace

Sheriff Esseson (1):
      Documentation: filesystem: Convert xfs.txt to ReST

 Documentation/admin-guide/index.rst                |   1 +
 .../{filesystems/xfs.txt => admin-guide/xfs.rst}   | 132 ++++++++++-----------
 Documentation/filesystems/dax.txt                  |   2 +-
 MAINTAINERS                                        |   3 +-
 fs/xfs/Makefile                                    |   4 +-
 fs/xfs/{ => libxfs}/xfs_trans_inode.c              |   4 +
 6 files changed, 73 insertions(+), 73 deletions(-)
 rename Documentation/{filesystems/xfs.txt => admin-guide/xfs.rst} (80%)
 rename fs/xfs/{ => libxfs}/xfs_trans_inode.c (96%)


Linus Torvalds July 18, 2019, 6:19 p.m. UTC | #1
On Thu, Jul 18, 2019 at 9:18 AM Darrick J. Wong <djwong@kernel.org> wrote:
> Please let me know if you run into anything weird, I promise I drank two
> cups of coffee this time around. :)

Apparently two cups is just the right amount.

pr-tracker-bot@kernel.org July 18, 2019, 6:30 p.m. UTC | #2
The pull request you sent on Thu, 18 Jul 2019 09:18:24 -0700:

> git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git tags/xfs-5.3-merge-13

has been merged into torvalds/linux.git:

Thank you!