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

[James Bottomley]

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-=wjWNpPW91wyEj4FC4pOimWEUtLVb_RwQgB+9h2OO6ynyA@xxxxxxxxxxxxxx/

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

James

Attachment: signature.asc
Description: This is a digitally signed message part