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:   Mon, 8 Jul 2019 12:01:14 +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: <20190708120114.5ca1613d@canb.auug.org.au>
In-Reply-To: <20190515131629.405837b0@canb.auug.org.au>
References: <20190515131629.405837b0@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/CAGrb0EMCBA2wpfIMB0fhwf"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/CAGrb0EMCBA2wpfIMB0fhwf
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Wed, 15 May 2019 13:16:29 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>=20
>   include/linux/pid.h
>=20
> between commit:
>=20
>   51f1b521a515 ("pidfd: add polling support")
>=20
> from the pidfd tree and commit:
>=20
>   c02e28a1bb18 ("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 include/linux/pid.h
> index 1484db6ca8d1,0be5829ddd80..000000000000
> --- a/include/linux/pid.h
> +++ b/include/linux/pid.h
> @@@ -3,7 -3,7 +3,8 @@@
>   #define _LINUX_PID_H
>  =20
>   #include <linux/rculist.h>
>  +#include <linux/wait.h>
> + #include <linux/refcount.h>
>  =20
>   enum pid_type
>   {

I am still getting this conflict (the commits have changed).  Just a
reminder in case you think Linus may need to know.

--=20
Cheers,
Stephen Rothwell

--Sig_/CAGrb0EMCBA2wpfIMB0fhwf
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0io+oACgkQAVBC80lX
0Gy8Ywf/ey4AfeVKO3j8FEe0EYsTiG3K6zB0YFUzo7lywFtEOd/nn4f9cSCUH97c
RXMxzH8BIPlhL0550XIL1N7oxV8BCw9jHZWH1N8Heh3BW3DxAsvcSgb4I5exlR+T
5czHb2ixuiEGBtZwRW3V/f9S28Y+KFhSo1xDjQpoBZQ6gvr5+2+XDKjY8yPJqkcs
8b23HJRaJ7qTetQto8imY+RrHVDxZ5GGIxsZg/EpXqPBPSKYXXpO0X+oYX9OnvD+
wV3A55ssMeHXzT9x+tS3MmS1ao7I54q7glNOFufboX0SHFb4Av7oa5ZknJcdfNiY
4tfKk85vZbQWORwdvTIFPBXapzQ9nA==
=RIHh
-----END PGP SIGNATURE-----

--Sig_/CAGrb0EMCBA2wpfIMB0fhwf--