linux-kernel - Re: linux-next: manual merge of the y2038 tree with the tip 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]

Date:   Tue, 3 Dec 2019 07:58:12 +0100
From:   Ingo Molnar <mingo@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Arnd Bergmann <arnd@...db.de>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Dmitry Safonov <dima@...sta.com>
Subject: Re: linux-next: manual merge of the y2038 tree with the tip tree


* Stephen Rothwell <sfr@...b.auug.org.au> 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