linux-kernel - Re: linux-next: build failure after merge of the vfio tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20201014202158.4d1725dc@x1.home>
Date:   Wed, 14 Oct 2020 20:21:58 -0600
From:   Alex Williamson <alex.williamson@...hat.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Diana Craciun OSS <diana.craciun@....nxp.com>,
        Bharat Bhushan <Bharat.Bhushan@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the vfio tree

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

> Hi Alex,
> 
> On Tue, 13 Oct 2020 13:20:16 -0600 Alex Williamson <alex.williamson@...hat.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