Re: linux-next: manual merge of the keys tree with the integrity tree

[Mimi Zohar]

Hi Stephen,

On Tue, 2019-07-09 at 10:11 +1000, Stephen Rothwell wrote:
> > 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.

Thank you for carrying the patch! ÂI did remember to mention it in the
pull request.  :)

Mimi