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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <1575342854.24227.43.camel@HansenPartnership.com>
Date:   Mon, 02 Dec 2019 19:14:14 -0800
From:   James Bottomley <James.Bottomley@...senPartnership.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Arnd Bergmann <arnd@...db.de>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Al Viro <viro@...iv.linux.org.uk>,
        "Martin K. Petersen" <martin.petersen@...cle.com>
Subject: Re: linux-next: manual merge of the y2038 tree with the scsi tree

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

Download attachment "signature.asc" of type "application/pgp-signature" (229 bytes)