| Message ID | 20211114172309.GE24307@magnolia (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [GIT,PULL] xfs: cleanups and resyncs for 5.16 | expand |
The pull request you sent on Sun, 14 Nov 2021 09:23:09 -0800:
> git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git tags/xfs-5.16-merge-5
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/ce49bfc8d0372212ccd7d1c1b45c60b077f77684
Thank you!
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(-)