Messages in this thread | | | From | Andreas Gruenbacher <> | Date | Thu, 10 Jun 2021 14:35:15 +0200 | Subject | Re: linux-next: build failure after merge of the gfs2 tree |
| |
Hi Stephen,
On Wed, Jun 9, 2021 at 5:08 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Hi all, > > After merging the gfs2 tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > Caused by commit > > f8524fce6a88 ("iov_iter: Add iov_iter_fault_in_writeable()") > > interacting with commits > > e59c7577f5d6 ("iov_iter: separate direction from flavour") > 30da2b24a3ed ("iov_iter: make the amount already copied available to iterator callbacks") > > from the vfs tree. > > I have applied the following fix up patch (I think it is mostly right?)
yes, that looks correct. I've updated the gfs2 for-next branch with a version that merges in the vfs bits, so the conflict should be gone now.
Thanks, Andreas
| |