Herbert Xu wrote:
> Applied.
Hmmm... That means that the crypto branch and the security branch are going
to conflict.
David
--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kerne
(2nd try that adds missing , to build.)
Signed-off-by: Marcus Meissner
---
crypto/testmgr.c | 16
1 file changed, 16 insertions(+)
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index ae8c57fd..7d66cf8 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -2143,6 +2143,10 @
On Sat, Feb 06, 2016 at 10:00:21AM +, David Howells 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
re
Herbert Xu 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?
Ummm. I did say I'd take i
On Sun, Feb 07, 2016 at 12:43:53AM +, David Howells wrote:
>
> Ummm. I did say I'd take it on top of my patches. How did you take it? Did
> you merge Tadeusz's branch? If so, I can probably merge it into mine also and
> git will Just Do The Right Thing™.
No I merged them as individual pat
