From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: Arnd Bergmann <arnd@arndb•de>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Dmitry Safonov <dima@arista•com>
Subject: Re: linux-next: manual merge of the y2038 tree with the tip tree
Date: Tue, 3 Dec 2019 14:02:59 +1100 [thread overview]
Message-ID: <20191203140259.33291393@canb.auug.org.au> (raw)
In-Reply-To: <20191127130139.0b16375c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1550 bytes --]
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@canb•auug.org.au> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-12-03 3:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-27 2:01 linux-next: manual merge of the y2038 tree with the tip tree Stephen Rothwell
2019-11-27 9:24 ` Arnd Bergmann
2019-12-03 3:02 ` Stephen Rothwell [this message]
2019-12-03 6:58 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191203140259.33291393@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=dima@arista$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox