Subject: Re: linux-next: manual merge of the y2038 tree with the tip tree

From: Ingo Molnar <[email-masked]>
Date: Tue, 3 Dec 2019 07:58:12 +0100

* Stephen Rothwell <[email-masked]> wrote:

> Hi all,
> 
> This is now a conflict between the tip tree and Linus' tree.

This too should be resolved in my latest update of the -next integration 
branch tip:auto-latest.

Thanks,

	Ingo