linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <djwong@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org,
	david@fromorbit.com, linux-kernel@vger.kernel.org,
	sandeen@sandeen.net, hch@lst.de
Subject: [GIT PULL] xfs: cleanups and resyncs for 5.16
Date: Sun, 14 Nov 2021 09:23:09 -0800	[thread overview]
Message-ID: <20211114172309.GE24307@magnolia> (raw)

Hi Linus,

Please pull this branch containing a handful of code cleanups for 5.16.

The most "exciting" aspect of this branch is that the xfsprogs
maintainer and I have worked through the last of the code discrepancies
between kernel and userspace libxfs such that there are no code
differences between the two except for #includes.  IOWs, diff suffices
to demonstrate that the userspace tools behave the same as the kernel,
and kernel-only bits are clearly marked in the /kernel/ source code
instead of just the userspace source.

The branch merges cleanly against upstream as of a few minutes ago.
Please let me know if anything else strange happens during the merge
process.

--D

The following changes since commit 2a09b575074ff3ed23907b6f6f3da87af41f592b:

  xfs: use swap() to make code cleaner (2021-10-30 09:28:55 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git tags/xfs-5.16-merge-5

for you to fetch changes up to 4a6b35b3b3f28df81fea931dc77c4c229cbdb5b2:

  xfs: sync xfs_btree_split macros with userspace libxfs (2021-11-11 09:13:39 -0800)

----------------------------------------------------------------
Minor tweaks for 5.16:
 * Clean up open-coded swap() calls.
 * A little bit of #ifdef golf to complete the reunification of the
   kernel and userspace libxfs source code.

----------------------------------------------------------------
Darrick J. Wong (1):
      xfs: sync xfs_btree_split macros with userspace libxfs

Eric Sandeen (1):
      xfs: #ifdef out perag code for userspace

Yang Guang (1):
      xfs: use swap() to make dabtree code cleaner

 fs/xfs/libxfs/xfs_ag.c       | 2 ++
 fs/xfs/libxfs/xfs_ag.h       | 8 +++++---
 fs/xfs/libxfs/xfs_btree.c    | 4 ++++
 fs/xfs/libxfs/xfs_da_btree.c | 5 +----
 4 files changed, 12 insertions(+), 7 deletions(-)

             reply	other threads:[~2021-11-14 17:23 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-14 17:23 Darrick J. Wong [this message]
2021-11-14 20:24 ` [GIT PULL] xfs: cleanups and resyncs for 5.16 pr-tracker-bot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211114172309.GE24307@magnolia \
    --to=djwong@kernel.org \
    --cc=david@fromorbit.com \
    --cc=hch@lst.de \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=sandeen@sandeen.net \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).