All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alex Williamson <alex.williamson@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Diana Craciun OSS <diana.craciun@oss.nxp.com>,
	Bharat Bhushan <Bharat.Bhushan@nxp.com>,
	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 vfio tree
Date: Wed, 14 Oct 2020 20:21:58 -0600	[thread overview]
Message-ID: <20201014202158.4d1725dc@x1.home> (raw)
In-Reply-To: <20201015115903.3399b116@canb.auug.org.au>

On Thu, 15 Oct 2020 11:59:03 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Alex,
> 
> On Tue, 13 Oct 2020 13:20:16 -0600 Alex Williamson <alex.williamson@redhat.com> wrote:
> >
> > Thanks, Stephen.  Diana has posted a 32bit build fix which I've merged,
> > maybe that was the error.  Also Diana's series in my branch is currently
> > dependent on fsl-bus support in GregKH's char-misc-next branch.  Looking
> > at the log from the successful build, I wonder if our branches are just
> > in the wrong order (vfio/next processed on line 341, char-misc-next
> > processed on 387).  I don't know if you regularly re-order for this
> > sort of thing, otherwise it should work out when Greg's branch gets
> > merged, but testing sooner in next would be preferred.  
> 
> I have put the vfio tree after the char-misc tree today (so hopefully
> it will build).  The proper way to do this is for you and Greg to have
> a shared branch with the commits you both depend on and bot merge that
> branch.  That way, it doesn't matter what order the tress are merged
> (by me or Linus).

Hi Stephen,

Well that seems like the obviously correct solution in retrospect ;)
thanks for the explanation.  I'll check-in with Greg to see if his pull
request is imminent or we can share a branch.  Thanks,

Alex


  reply	other threads:[~2020-10-15  2:22 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-13  3:07 linux-next: build failure after merge of the vfio tree Stephen Rothwell
2020-10-13 15:56 ` Diana Craciun OSS
2020-10-13 19:20   ` Alex Williamson
2020-10-15  0:59     ` Stephen Rothwell
2020-10-15  2:21       ` Alex Williamson [this message]
2020-10-13 22:16   ` Stephen Rothwell
2020-10-14 13:43     ` Diana Craciun OSS

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=20201014202158.4d1725dc@x1.home \
    --to=alex.williamson@redhat.com \
    --cc=Bharat.Bhushan@nxp.com \
    --cc=diana.craciun@oss.nxp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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.