Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 9 Jul 2019 09:12:36 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>,
        Christian Brauner <christian@brauner.io>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        "Joel Fernandes (Google)" <joel@joelfernandes.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 pidfd tree
Message-ID: <20190709091236.3b658262@canb.auug.org.au>
In-Reply-To: <20190522114314.515b410d@canb.auug.org.au>
References: <20190522114314.515b410d@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/IRDCyuFiV/FuGuV+Q6a9QFe"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/IRDCyuFiV/FuGuV+Q6a9QFe
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Wed, 22 May 2019 11:43:14 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>=20
>   kernel/pid.c
>=20
> between commit:
>=20
>   99e9da7f2796 ("pid: add pidfd_open()")
>=20
> from the pidfd tree and commit:
>=20
>   51c59c914840 ("kernel/pid.c: convert struct pid:count to refcount_t")
>=20
> from the akpm-current tree.
>=20
> 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.
>=20
> --=20
> Cheers,
> Stephen Rothwell
>=20
> 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>
>  =20

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

--=20
Cheers,
Stephen Rothwell

--Sig_/IRDCyuFiV/FuGuV+Q6a9QFe
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0jzeQACgkQAVBC80lX
0Gwb1wf+IPW9D2u1iKzZgxiBMWjepDrUjwjHC9DHUXJclpawkF4A0nR4sW3vZnP+
RyDNy1UrE377NY5XNWviBBIrWUhynPslxMTbDNYcLZT5phMCsmqUWNx0ZtAYUEQT
jmupMjSjwVd4mbr2ar33LQgP3FVZcaefmGXBl5v1LCdYmPlKiDCjm00jtObLJae+
/wsyT9INHXVPHrMFcjlOhToeDrRuy8Wmvw8RHtALVLV1uhv2Q3+0l6TB9ryEHMlW
/sQBicaMnY/jrV3MzvY3NV5nEPDyN0s9Ls1PwjYGyamQQKqWNB40ZtdQTDDjzzV0
9d4bsLeZg1OAA3Xx/1Z/3Jg0+slE7Q==
=5GWn
-----END PGP SIGNATURE-----

--Sig_/IRDCyuFiV/FuGuV+Q6a9QFe--