Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the y2038 tree with the tip tree
@ 2019-11-27  2:01 Stephen Rothwell
  2019-11-27  9:24 ` Arnd Bergmann
  2019-12-03  3:02 ` Stephen Rothwell
  0 siblings, 2 replies; 4+ messages in thread
From: Stephen Rothwell @ 2019-11-27  2:01 UTC (permalink / raw)
  To: Arnd Bergmann, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
	Peter Zijlstra
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Dmitry Safonov

[-- Attachment #1: Type: text/plain, Size: 1286 bytes --]

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.

-- 
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;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: linux-next: manual merge of the y2038 tree with the tip tree
  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
  1 sibling, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2019-11-27  9:24 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	Linux Next Mailing List, Linux Kernel Mailing List,
	Dmitry Safonov

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: linux-next: manual merge of the y2038 tree with the tip tree
  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
  2019-12-03  6:58   ` Ingo Molnar
  1 sibling, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2019-12-03  3:02 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
  Cc: Arnd Bergmann, Linux Next Mailing List,
	Linux Kernel Mailing List, Dmitry Safonov

[-- 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 --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: linux-next: manual merge of the y2038 tree with the tip tree
  2019-12-03  3:02 ` Stephen Rothwell
@ 2019-12-03  6:58   ` Ingo Molnar
  0 siblings, 0 replies; 4+ messages in thread
From: Ingo Molnar @ 2019-12-03  6:58 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
	Arnd Bergmann, Linux Next Mailing List,
	Linux Kernel Mailing List, Dmitry Safonov


* Stephen Rothwell <sfr@canb.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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, back to index

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2019-12-03  6:58   ` Ingo Molnar

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git