Subject: Re: linux-next: manual merge of the akpm-current tree with the pidfd tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 9 Jul 2019 09:12:36 +1000

Hi all,

On Wed, 22 May 2019 11:43:14 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   kernel/pid.c
> 
> between commit:
> 
>   99e9da7f2796 ("pid: add pidfd_open()")
> 
> from the pidfd tree and commit:
> 
>   51c59c914840 ("kernel/pid.c: convert struct pid:count to refcount_t")
> 
> from the akpm-current 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/pid.c
> index 39181ccca846,b59681973dd6..000000000000
> --- a/kernel/pid.c
> +++ b/kernel/pid.c
> @@@ -37,8 -36,7 +37,8 @@@
>   #include <linux/init_task.h>
>   #include <linux/syscalls.h>
>   #include <linux/proc_ns.h>
> - #include <linux/proc_fs.h>
> + #include <linux/refcount.h>
>  +#include <linux/sched/signal.h>
>   #include <linux/sched/task.h>
>   #include <linux/idr.h>
>   

I am still getting this conflict.  Just a reminder in case you think
Linus may need to know.

-- 
Cheers,
Stephen Rothwell