linux-next: manual merge of the pidfd tree with the csky tree

linux-next: manual merge of the pidfd tree with the csky tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the pidfd tree got a conflict in:

  arch/csky/Kconfig

between commits:

  e95a4f8cb985 ("csky: Add SECCOMP_FILTER supported")
  953131e5b5a5 ("csky: Use top-down mmap layout")
  bdcd93ef9afb ("csky: Add context tracking support")

from the csky tree and commit:

  140c8180eb7c ("arch: remove HAVE_COPY_THREAD_TLS")

from the pidfd 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 arch/csky/Kconfig
index af238739811e,902f1142d550..000000000000
--- a/arch/csky/Kconfig
+++ b/arch/csky/Kconfig
@@@ -39,11 -38,6 +39,10 @@@ config CSK
  	select GX6605S_TIMER if CPU_CK610
  	select HAVE_ARCH_TRACEHOOK
  	select HAVE_ARCH_AUDITSYSCALL
 +	select HAVE_ARCH_MMAP_RND_BITS
 +	select HAVE_ARCH_SECCOMP_FILTER
- 	select HAVE_COPY_THREAD_TLS
 +	select HAVE_CONTEXT_TRACKING
 +	select HAVE_VIRT_CPU_ACCOUNTING_GEN
  	select HAVE_DEBUG_BUGVERBOSE
  	select HAVE_DYNAMIC_FTRACE
  	select HAVE_DYNAMIC_FTRACE_WITH_REGS

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

Re: linux-next: manual merge of the pidfd tree with the csky tree

[Stephen Rothwell]

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

Hi all,

On Mon, 3 Aug 2020 18:25:50 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the pidfd tree got a conflict in:
> 
>   arch/csky/Kconfig
> 
> between commits:
> 
>   e95a4f8cb985 ("csky: Add SECCOMP_FILTER supported")
>   953131e5b5a5 ("csky: Use top-down mmap layout")
>   bdcd93ef9afb ("csky: Add context tracking support")
> 
> from the csky tree and commit:
> 
>   140c8180eb7c ("arch: remove HAVE_COPY_THREAD_TLS")
> 
> from the pidfd 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 arch/csky/Kconfig
> index af238739811e,902f1142d550..000000000000
> --- a/arch/csky/Kconfig
> +++ b/arch/csky/Kconfig
> @@@ -39,11 -38,6 +39,10 @@@ config CSK
>   	select GX6605S_TIMER if CPU_CK610
>   	select HAVE_ARCH_TRACEHOOK
>   	select HAVE_ARCH_AUDITSYSCALL
>  +	select HAVE_ARCH_MMAP_RND_BITS
>  +	select HAVE_ARCH_SECCOMP_FILTER
> - 	select HAVE_COPY_THREAD_TLS
>  +	select HAVE_CONTEXT_TRACKING
>  +	select HAVE_VIRT_CPU_ACCOUNTING_GEN
>   	select HAVE_DEBUG_BUGVERBOSE
>   	select HAVE_DYNAMIC_FTRACE
>   	select HAVE_DYNAMIC_FTRACE_WITH_REGS

This is now a conflict between the csky tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: manual merge of the pidfd tree with the csky tree

[Stephen Rothwell]

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

Hi all,

On Mon, 6 Jul 2020 15:06:13 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the pidfd tree got a conflict in:
> 
>   arch/csky/kernel/process.c
> 
> between commit:
> 
>   29adb883aa77 ("csky: remove unusued thread_saved_pc and *_segments functions/macros")
> 
> from the csky tree and commit:
> 
>   714acdbd1c94 ("arch: rename copy_thread_tls() back to copy_thread()")
> 
> from the pidfd 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.
> 
> diff --cc arch/csky/kernel/process.c
> index 3da63cf0bfde,28cfeaaf902a..000000000000
> --- a/arch/csky/kernel/process.c
> +++ b/arch/csky/kernel/process.c
> @@@ -30,7 -30,17 +30,7 @@@ asmlinkage void ret_from_kernel_thread(
>    */
>   void flush_thread(void){}
>   
> - int copy_thread_tls(unsigned long clone_flags,
>  -/*
>  - * Return saved PC from a blocked thread
>  - */
>  -unsigned long thread_saved_pc(struct task_struct *tsk)
>  -{
>  -	struct switch_stack *sw = (struct switch_stack *)tsk->thread.sp;
>  -
>  -	return sw->r15;
>  -}
>  -
> + int copy_thread(unsigned long clone_flags,
>   		unsigned long usp,
>   		unsigned long kthread_arg,
>   		struct task_struct *p,

This is now a conflict between the csky tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: manual merge of the pidfd tree with the csky tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the pidfd tree got a conflict in:

  arch/csky/kernel/process.c

between commit:

  29adb883aa77 ("csky: remove unusued thread_saved_pc and *_segments functions/macros")

from the csky tree and commit:

  714acdbd1c94 ("arch: rename copy_thread_tls() back to copy_thread()")

from the pidfd 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 arch/csky/kernel/process.c
index 3da63cf0bfde,28cfeaaf902a..000000000000
--- a/arch/csky/kernel/process.c
+++ b/arch/csky/kernel/process.c
@@@ -30,7 -30,17 +30,7 @@@ asmlinkage void ret_from_kernel_thread(
   */
  void flush_thread(void){}
  
- int copy_thread_tls(unsigned long clone_flags,
 -/*
 - * Return saved PC from a blocked thread
 - */
 -unsigned long thread_saved_pc(struct task_struct *tsk)
 -{
 -	struct switch_stack *sw = (struct switch_stack *)tsk->thread.sp;
 -
 -	return sw->r15;
 -}
 -
+ int copy_thread(unsigned long clone_flags,
  		unsigned long usp,
  		unsigned long kthread_arg,
  		struct task_struct *p,

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

linux-next: manual merge of the pidfd tree with the csky tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the pidfd tree got a conflict in:

  arch/csky/Kconfig

between commit:

  f4dd2edafba0 ("csky: add support for SECCOMP and SECCOMP_FILTER")

from the csky tree and commit:

  140c8180eb7c ("arch: remove HAVE_COPY_THREAD_TLS")

from the pidfd 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 arch/csky/Kconfig
index 822362d0598e,902f1142d550..000000000000
--- a/arch/csky/Kconfig
+++ b/arch/csky/Kconfig
@@@ -38,8 -38,6 +38,7 @@@ config CSK
  	select GX6605S_TIMER if CPU_CK610
  	select HAVE_ARCH_TRACEHOOK
  	select HAVE_ARCH_AUDITSYSCALL
 +	select HAVE_ARCH_SECCOMP_FILTER
- 	select HAVE_COPY_THREAD_TLS
  	select HAVE_DEBUG_BUGVERBOSE
  	select HAVE_DYNAMIC_FTRACE
  	select HAVE_DYNAMIC_FTRACE_WITH_REGS

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