summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-11-14 12:18:22 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-11-14 12:18:22 -0800
commitce49bfc8d0372212ccd7d1c1b45c60b077f77684 (patch)
treeb18a00ebf4d5c03329f2f8181407bf2bca345f0f /Makefile
parentc3b68c27f58a07130382f3fa6320c3652ad76f15 (diff)
parent4a6b35b3b3f28df81fea931dc77c4c229cbdb5b2 (diff)
downloadlwn-ce49bfc8d0372212ccd7d1c1b45c60b077f77684.tar.gz
lwn-ce49bfc8d0372212ccd7d1c1b45c60b077f77684.zip
Merge tag 'xfs-5.16-merge-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull xfs cleanups from Darrick Wong: "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. Summary: - Clean up open-coded swap() calls. - A little bit of #ifdef golf to complete the reunification of the kernel and userspace libxfs source code" * tag 'xfs-5.16-merge-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: xfs: sync xfs_btree_split macros with userspace libxfs xfs: #ifdef out perag code for userspace xfs: use swap() to make dabtree code cleaner
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions