public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
* [GIT PULL] xfs: cleanups for 5.3
@ 2019-07-18 16:18 Darrick J. Wong
  2019-07-18 18:19 ` Linus Torvalds
  2019-07-18 18:30 ` pr-tracker-bot
  0 siblings, 2 replies; 4+ messages in thread
From: Darrick J. Wong @ 2019-07-18 16:18 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: Darrick J. Wong, linux-fsdevel, linux-xfs, david, linux-kernel,
	sandeen, hch

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. :)

--D

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%)

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [GIT PULL] xfs: cleanups for 5.3
  2019-07-18 16:18 [GIT PULL] xfs: cleanups for 5.3 Darrick J. Wong
@ 2019-07-18 18:19 ` Linus Torvalds
  2019-07-18 18:30 ` pr-tracker-bot
  1 sibling, 0 replies; 4+ messages in thread
From: Linus Torvalds @ 2019-07-18 18:19 UTC (permalink / raw)
  To: Darrick J. Wong
  Cc: linux-fsdevel, linux-xfs, Dave Chinner, Linux List Kernel Mailing,
	Eric Sandeen, Christoph Hellwig

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.

                 Linus

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [GIT PULL] xfs: cleanups for 5.3
  2019-07-18 16:18 [GIT PULL] xfs: cleanups for 5.3 Darrick J. Wong
  2019-07-18 18:19 ` Linus Torvalds
@ 2019-07-18 18:30 ` pr-tracker-bot
  2019-07-18 18:30   ` pr-tracker-bot
  1 sibling, 1 reply; 4+ messages in thread
From: pr-tracker-bot @ 2019-07-18 18:30 UTC (permalink / raw)
  To: Darrick J. Wong
  Cc: Linus Torvalds, linux-fsdevel, linux-xfs, david, linux-kernel,
	sandeen, hch

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:
https://git.kernel.org/torvalds/c/366a4e38b8d0d3e8c7673ab5c1b5e76bbfbc0085

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [GIT PULL] xfs: cleanups for 5.3
  2019-07-18 18:30 ` pr-tracker-bot
@ 2019-07-18 18:30   ` pr-tracker-bot
  0 siblings, 0 replies; 4+ messages in thread
From: pr-tracker-bot @ 2019-07-18 18:30 UTC (permalink / raw)
  To: Darrick J. Wong
  Cc: Linus Torvalds, Darrick J. Wong, linux-fsdevel, linux-xfs, david,
	linux-kernel, sandeen, hch

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:
https://git.kernel.org/torvalds/c/366a4e38b8d0d3e8c7673ab5c1b5e76bbfbc0085

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-07-18 18:30 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-18 16:18 [GIT PULL] xfs: cleanups for 5.3 Darrick J. Wong
2019-07-18 18:19 ` Linus Torvalds
2019-07-18 18:30 ` pr-tracker-bot
2019-07-18 18:30   ` pr-tracker-bot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox