All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mimi Zohar <zohar@linux.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	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
Date: Mon, 08 Jul 2019 20:31:35 -0400	[thread overview]
Message-ID: <1562632295.11461.73.camel@linux.ibm.com> (raw)
In-Reply-To: <20190709101107.0754b26c@canb.auug.org.au>

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


  reply	other threads:[~2019-07-09  0:31 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-26  4:33 linux-next: manual merge of the keys tree with the integrity tree Stephen Rothwell
2019-07-09  0:11 ` Stephen Rothwell
2019-07-09  0:31   ` Mimi Zohar [this message]
2019-07-09  0:42     ` Stephen Rothwell
2021-04-07  4:15 Stephen Rothwell
2021-04-12  7:08 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1562632295.11461.73.camel@linux.ibm.com \
    --to=zohar@linux.ibm.com \
    --cc=dhowells@redhat.com \
    --cc=dmitry.kasatkin@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=zohar@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.