Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 14 Oct 2020 20:21:58 -0600
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
Message-ID: <20201014202158.4d1725dc@x1.home>
In-Reply-To: <20201015115903.3399b116@canb.auug.org.au>
References: <20201013140744.64937ecd@canb.auug.org.au>
        <276bf3f3-108b-fe60-4d17-d3f314e61db4@oss.nxp.com>
        <20201013132016.44af05f1@w520.home>
        <20201015115903.3399b116@canb.auug.org.au>
Organization: Red Hat
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Precedence: bulk

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