From: James Morris <jmorris@namei.org>
To: David Howells <dhowells@redhat.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
Tadeusz Struk <tadeusz.struk@intel.com>,
linux-kernel@vger.kernel.org,
linux-security-module@vger.kernel.org,
linux-crypto@vger.kernel.org, zohar@linux.vnet.ibm.com
Subject: Re: Transferring applied X.509 patches from crypto/next to security/next
Date: Tue, 9 Feb 2016 12:01:19 +1100 (AEDT) [thread overview]
Message-ID: <alpine.LRH.2.20.1602091200580.6966@namei.org> (raw)
In-Reply-To: <25680.1454939914@warthog.procyon.org.uk>
On Mon, 8 Feb 2016, David Howells wrote:
> Herbert Xu <herbert@gondor.apana.org.au> wrote:
>
> > > Hmmm... That means that the crypto branch and the security branch are going
> > > to conflict.
> >
> > I thought you were OK with it going in now as you said that you'll
> > fix it up later. Sorry for the misunderstanding. Do you want me to
> > revert?
>
> If you can back them out, I'll apply them to my keys-next branch. Unless
> James is willing to rebase security/next on top of your crypto branch?
>
I don't want to rebase my tree.
--
James Morris
<jmorris@namei.org>
next prev parent reply other threads:[~2016-02-09 1:01 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-02 18:08 [PATCH v5 0/3] crypto: KEYS: convert public key to akcipher api Tadeusz Struk
2016-02-02 18:08 ` [PATCH v5 1/3] crypto: KEYS: convert public key and digsig asym to the " Tadeusz Struk
2016-02-02 18:08 ` [PATCH v5 2/3] integrity: convert digsig to " Tadeusz Struk
2016-02-02 18:09 ` [PATCH v5 3/3] crypto: public_key: remove MPIs from public_key_signature struct Tadeusz Struk
2016-02-06 7:47 ` [PATCH v5 0/3] crypto: KEYS: convert public key to akcipher api Herbert Xu
2016-02-06 10:00 ` David Howells
2016-02-06 14:27 ` Herbert Xu
2016-02-07 0:43 ` David Howells
2016-02-07 1:22 ` Herbert Xu
2016-02-08 13:58 ` Transferring applied X.509 patches from crypto/next to security/next David Howells
2016-02-08 21:25 ` Mimi Zohar
2016-02-09 1:01 ` James Morris [this message]
2016-02-09 8:40 ` Herbert Xu
2016-02-09 15:43 ` David Howells
2016-02-09 17:46 ` Herbert Xu
2016-02-09 16:49 ` [PATCH v5 0/3] crypto: KEYS: convert public key to akcipher api David Howells
2016-02-09 17:10 ` Tadeusz Struk
2016-02-10 14:17 ` [PATCH v5 1/3] crypto: KEYS: convert public key and digsig asym to the " David Howells
2016-02-10 23:09 ` Tadeusz Struk
2016-02-11 9:51 ` David Howells
2016-02-11 10:08 ` David Howells
2016-02-16 20:37 ` Tadeusz Struk
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=alpine.LRH.2.20.1602091200580.6966@namei.org \
--to=jmorris@namei.org \
--cc=dhowells@redhat.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=tadeusz.struk@intel.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome