lkml.org 
[lkml]   [2019]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the y2038 tree with the scsi tree
From
Date
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@mail.gmail.com/

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

James
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2019-12-03 04:14    [W:0.031 / U:6.568 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site