linux-kernel - Re: linux-next: manual merge of the driver-core tree with the drivers-x86 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: <20200401181810.14792d60@canb.auug.org.au>
Date:   Wed, 1 Apr 2020 18:18:10 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andy Shevchenko <andy.shevchenko@...il.com>
Cc:     Darren Hart <dvhart@...radead.org>, Greg KH <greg@...ah.com>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Hans de Goede <hdegoede@...hat.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the
 drivers-x86 tree

Hi Andy,

On Wed, 1 Apr 2020 09:47:20 +0300 Andy Shevchenko <andy.shevchenko@...il.com> wrote:
>
> On Wed, Apr 1, 2020 at 6:11 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
> > This is now a conflict between the drivers-x86 tree and Linus' tree.  
> 
> PDx86 is in Linus tree already with conflict resolutions.

Great.

There is always a bit of a lag with what I see during the merge
window i.e. Linus continues to merge stuff after I have taken my daily
snapshot of his tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped