Message ID | 20210429170619.GM3122264@magnolia (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [GIT,PULL] xfs: new code for 5.13 | expand |
On Thu, Apr 29, 2021 at 10:06 AM Darrick J. Wong <djwong@kernel.org> wrote: > > Unfortunately, some of our refactoring work collided with Miklos' > patchset that refactors FS_IOC_[GS]ETFLAGS and FS_IOC_FS[GS]ETXATTR. Ok, the resolution looked reasonably straightforward to me, and I ended up with what looks like the same end result you did. But I only did a visual inspection of our --cc diffs (you seem to use --patience, which made my initial diff look different) and obviously verified that it all builds cleanly, I didn't do any actual testing. So please double-check that everything still looks good, Linus
The pull request you sent on Thu, 29 Apr 2021 10:06:19 -0700:
> git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git tags/xfs-5.13-merge-3
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/d2b6f8a179194de0ffc4886ffc2c4358d86047b8
Thank you!
On Thu, Apr 29, 2021 at 10:50:51AM -0700, Linus Torvalds wrote: > On Thu, Apr 29, 2021 at 10:06 AM Darrick J. Wong <djwong@kernel.org> wrote: > > > > Unfortunately, some of our refactoring work collided with Miklos' > > patchset that refactors FS_IOC_[GS]ETFLAGS and FS_IOC_FS[GS]ETXATTR. > > Ok, the resolution looked reasonably straightforward to me, and I > ended up with what looks like the same end result you did. > > But I only did a visual inspection of our --cc diffs (you seem to use > --patience, which made my initial diff look different) and obviously > verified that it all builds cleanly, I didn't do any actual testing. > > So please double-check that everything still looks good, At a first glance it looks good to me, thanks. :) (Currently running fstests to double-check...) --D > > Linus
diff --cc fs/xfs/xfs_ioctl.c index bbda105a2ce5,bf490bfae6cb..000000000000 --- a/fs/xfs/xfs_ioctl.c