Hi all,
This is now a conflict between the tip tree and Linus' tree.
On Wed, 27 Nov 2019 13:01:39 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc kernel/time/time.c
> index 4d434dad6ebc,58e312e7380f..000000000000
> --- a/kernel/time/time.c
> +++ b/kernel/time/time.c
> @@@ -884,8 -879,7 +882,7 @@@ int get_timespec64(struct timespec64 *t
> ts->tv_sec = kts.tv_sec;
>
> /* Zero out the padding for 32 bit systems or in compat mode */
> - if (IS_ENABLED(CONFIG_64BIT_TIME) && (!IS_ENABLED(CONFIG_64BIT) ||
> - in_compat_syscall()))
> - if (in_compat_syscall())
> ++ if (!IS_ENABLED(CONFIG_64BIT) || in_compat_syscall())
> kts.tv_nsec &= 0xFFFFFFFFUL;
>
> ts->tv_nsec = kts.tv_nsec;
--
Cheers,
Stephen Rothwell
Attachment:
pgpfZKDa0Xk5T.pgp
Description: OpenPGP digital signature
