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

[Ingo Molnar]

* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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