Subject: Re: linux-next: manual merge of the driver-core tree with the drivers-x86 tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 1 Apr 2020 18:18:10 +1100

Hi Andy,

On Wed, 1 Apr 2020 09:47:20 +0300 Andy Shevchenko <[email-masked]> wrote:
>
> On Wed, Apr 1, 2020 at 6:11 AM Stephen Rothwell <[email-masked]> 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