diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-14 12:18:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-14 12:18:22 -0800 |
| commit | ce49bfc8d0372212ccd7d1c1b45c60b077f77684 (patch) | |
| tree | b18a00ebf4d5c03329f2f8181407bf2bca345f0f /include/linux/fpga/fpga-mgr.h | |
| parent | Merge tag 'for-5.16/parisc-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux (diff) | |
| parent | xfs: sync xfs_btree_split macros with userspace libxfs (diff) | |
| download | linux-dev-ce49bfc8d0372212ccd7d1c1b45c60b077f77684.tar.xz linux-dev-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 'include/linux/fpga/fpga-mgr.h')
0 files changed, 0 insertions, 0 deletions