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 10:11:07 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Howells <dhowells@redhat.com>,
        Mimi Zohar <zohar@linux.vnet.ibm.com>,
        Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the keys tree with the integrity
 tree
Message-ID: <20190709101107.0754b26c@canb.auug.org.au>
In-Reply-To: <20190626143333.7ee527ca@canb.auug.org.au>
References: <20190626143333.7ee527ca@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/KbtJCZGIIH=5V6pKkYuzgHs"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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

Hi all,

On Wed, 26 Jun 2019 14:33:33 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>=20
> Today's linux-next merge of the keys tree got a conflict in:
>=20
>   security/integrity/digsig.c
>=20
> between commit:
>=20
>   8c655784e2cf ("integrity: Fix __integrity_init_keyring() section mismat=
ch")
>=20
> from the integrity tree and commit:
>=20
>   79512db59dc8 ("keys: Replace uid/gid/perm permissions checking with an =
ACL")
>=20
> from the keys 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 security/integrity/digsig.c
> index 868ade3e8970,e432900c00b9..000000000000
> --- a/security/integrity/digsig.c
> +++ b/security/integrity/digsig.c
> @@@ -69,9 -70,8 +70,9 @@@ int integrity_digsig_verify(const unsig
>   	return -EOPNOTSUPP;
>   }
>  =20
>  -static int __integrity_init_keyring(const unsigned int id, struct key_a=
cl *acl,
>  -				    struct key_restriction *restriction)
>  +static int __init __integrity_init_keyring(const unsigned int id,
> - 					   key_perm_t perm,
> ++					   struct key_acl *acl,
>  +					   struct key_restriction *restriction)
>   {
>   	const struct cred *cred =3D current_cred();
>   	int err =3D 0;

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

--=20
Cheers,
Stephen Rothwell

--Sig_/KbtJCZGIIH=5V6pKkYuzgHs
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0j25sACgkQAVBC80lX
0GwWTwf/eW9EhsHg+4ROjz89YntEN+CT4XpTKCq516Wb3ZRdPQx6ZBECkh4pW+1M
j+pa4aZR036zZ55mdD1MkHRiP0LJ7DBQaVKhov9gxb9ZKhffTN65SsGf4ZkdmXaM
s4Gr2Smh0MzuWuviS5/+ImAJBl0H13h5jRzSPBl58YN6NrWueFtaj7zEBIbA8wYF
B/O0jKYtTVhTmyCWke/zpbR4aeZ/QWjoVYvOJeLTXSIreLkatr2NZWTrh44Qeemi
RR1aJfM676G/AaDeYIDJyJFaui4fZ8izj2hx/xhOSuTJ8PGVbrLnYc29yjxrPbNz
scpB4G10CtWNxmFcw0hucM/r6nMWmA==
=/oWY
-----END PGP SIGNATURE-----

--Sig_/KbtJCZGIIH=5V6pKkYuzgHs--