Hi all,
On Mon, 6 Jul 2020 15:06:13 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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:
pgplWOpQzf5nN.pgp
Description: OpenPGP digital signature
