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

From: James Bottomley <[email-masked]>
Date: Mon, 02 Dec 2019 19:14:14 -0800

On Tue, 2019-12-03 at 14:00 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> This is now a conflict between the scsi tree and Linus' tree.

Actually Linus resolved it:

https://lore.kernel.org/linux-scsi/CAHk-=[email-masked]/

So been there, done that and even got to crack a monty python joke.

James