All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andreas Gruenbacher <agruenba@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Steven Whitehouse <swhiteho@redhat.com>,
	Bob Peterson <rpeterso@redhat.com>,
	Al Viro <viro@zeniv.linux.org.uk>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the gfs2 tree
Date: Thu, 10 Jun 2021 14:35:15 +0200	[thread overview]
Message-ID: <CAHc6FU6cV3R6Atatf8K6=j9hwgUE2MvXDLsw7ctBtneCFrREgA@mail.gmail.com> (raw)
In-Reply-To: <20210609130751.38a409a8@canb.auug.org.au>

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


  reply	other threads:[~2021-06-10 12:35 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-09  3:07 linux-next: build failure after merge of the gfs2 tree Stephen Rothwell
2021-06-10 12:35 ` Andreas Gruenbacher [this message]
2021-10-19 22:22 Stephen Rothwell
2021-10-19 23:21 ` Andreas Grünbacher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAHc6FU6cV3R6Atatf8K6=j9hwgUE2MvXDLsw7ctBtneCFrREgA@mail.gmail.com' \
    --to=agruenba@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rpeterso@redhat.com \
    --cc=sfr@canb.auug.org.au \
    --cc=swhiteho@redhat.com \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.