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] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAK8P3a3ZitDAXj+4UWYQM+Vv6FvO+q7DAx6ZhBZU58NPH6MvaQ@mail.gmail.com>
Date:   Wed, 27 Nov 2019 10:24:52 +0100
From:   Arnd Bergmann <arnd@...db.de>
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>,
        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

On Wed, Nov 27, 2019 at 3:01 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the y2038 tree got a conflict in:
>
>   kernel/time/time.c
>
> between commit:
>
>   7b8474466ed9 ("time: Zero the upper 32-bits in __kernel_timespec on 32-bit")
>
> from the tip tree and commit:
>
>   3ca47e958a64 ("y2038: remove CONFIG_64BIT_TIME")
>
> from the y2038 tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Looks good, thanks!

       Arnd