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

[Arnd Bergmann]

On Wed, Nov 27, 2019 at 3:01 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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