Hi all,
On Wed, 26 Jun 2019 14:33:33 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the keys tree got a conflict in:
>
> security/integrity/digsig.c
>
> between commit:
>
> 8c655784e2cf ("integrity: Fix __integrity_init_keyring() section mismatch")
>
> from the integrity tree and commit:
>
> 79512db59dc8 ("keys: Replace uid/gid/perm permissions checking with an ACL")
>
> from the keys 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 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;
> }
>
> -static int __integrity_init_keyring(const unsigned int id, struct key_acl *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 = current_cred();
> int err = 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.
--
Cheers,
Stephen Rothwell
Attachment:
pgpra7rClwE5j.pgp
Description: OpenPGP digital signature
