linux-kernel - Re: linux-next: manual merge of the char-misc tree with the driver-core 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190703074109.4b2ca5bc@canb.auug.org.au>
Date:   Wed, 3 Jul 2019 07:41:09 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     "Michael S. Tsirkin" <mst@...hat.com>
Cc:     Joerg Roedel <joro@...tes.org>,
        Jean-Philippe Brucker <Jean-Philippe.Brucker@....com>,
        Nathan Chancellor <natechancellor@...il.com>,
        Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Suzuki Poulose <Suzuki.Poulose@....com>,
        Mathieu Poirier <mathieu.poirier@...aro.org>
Subject: Re: linux-next: manual merge of the char-misc tree with the
 driver-core tree

Hi all,

On Tue, 2 Jul 2019 13:05:59 -0400 "Michael S. Tsirkin" <mst@...hat.com> wrote:
>
> On Tue, Jul 02, 2019 at 05:58:51PM +0200, Joerg Roedel wrote:
> > On Tue, Jul 02, 2019 at 11:23:34AM -0400, Michael S. Tsirkin wrote:  
> > > I can drop virtio iommu from my tree. Where's yours? I'd like to take a
> > > last look and send an ack.  
> > 
> > It is not in my tree yet, because I was waiting for your ack on the
> > patches wrt. the spec.
> > 
> > Given that the merge window is pretty close I can't promise to take it
> > into my tree for v5.3 when you ack it, so if it should go upstream this
> > time its better to keep it in your tree.
> 
> Hmm. But then the merge build fails. I guess I will have to include the
> patch in the pull request then?
> 

All you (and the driver-core maintainer) need to do is make sure you
tell Linus that the merge requires the fix ... he can then apply it to
the merge commit just as I have.  Linus has asked that maintainers do
not (in general) cross merge to avoid these (semantic) conflicts.
Sometimes, in more complex cases, it may be necessary for maintainers
to share a (non changing) subset of their trees, but this case is
pretty trivial.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped