From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Uri Simchoni <uri@jdland.co.il>
Subject: linux-next: manual merge of the crypto tree with Linus' tree
Date: Wed, 14 Apr 2010 11:48:56 +1000 [thread overview]
Message-ID: <20100414114856.54e1cb21.sfr@canb.auug.org.au> (raw)
Hi Herbert,
Today's linux-next merge of the crypto tree got a conflict in
drivers/crypto/mv_cesa.c between commit
5a0e3ad6af8660be21ca98a971cd00f331318c05 ("include cleanup: Update gfp.h
and slab.h includes to prepare for breaking implicit slab.h inclusion
from percpu.h") from Linus' tree and commit
750052dd2400cd09e0864d75b63c2c0bf605056f ("crypto: mv_cesa - Add sha1 and
hmac(sha1) async hash drivers") from the crypto tree.
Just context changes. I fixed it up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/crypto/mv_cesa.c
index 6f29012,1cee5a9..0000000
--- a/drivers/crypto/mv_cesa.c
+++ b/drivers/crypto/mv_cesa.c
@@@ -14,9 -14,14 +14,15 @@@
#include <linux/kthread.h>
#include <linux/platform_device.h>
#include <linux/scatterlist.h>
+#include <linux/slab.h>
+ #include <crypto/internal/hash.h>
+ #include <crypto/sha.h>
#include "mv_cesa.h"
+
+ #define MV_CESA "MV-CESA:"
+ #define MAX_HW_HASH_SIZE 0xFFFF
+
/*
* STM:
* /---------------------------------------\
next reply other threads:[~2010-04-14 1:48 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-14 1:48 Stephen Rothwell [this message]
2010-04-14 3:14 ` linux-next: manual merge of the crypto tree with Linus' tree Herbert Xu
2012-05-07 2:11 Stephen Rothwell
2012-05-07 4:16 ` Herbert Xu
2012-05-07 8:09 ` Arnd Bergmann
2012-05-07 9:04 ` Herbert Xu
2012-05-07 11:02 ` Linus Walleij
2012-05-07 2:31 Stephen Rothwell
2012-05-07 4:20 ` Herbert Xu
2014-04-17 2:49 Stephen Rothwell
2014-04-17 2:57 Stephen Rothwell
2014-05-09 2:07 Stephen Rothwell
2014-05-09 12:51 ` Herbert Xu
2019-06-03 0:52 Stephen Rothwell
2019-06-11 2:07 Stephen Rothwell
2019-08-23 3:08 Stephen Rothwell
2019-08-23 3:25 ` Nick Desaulniers
2019-11-05 2:23 Stephen Rothwell
2020-05-11 3:23 Stephen Rothwell
2020-09-21 2:36 Stephen Rothwell
2021-06-15 1:39 Stephen Rothwell
2023-06-26 1:52 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=20100414114856.54e1cb21.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=herbert@gondor.apana.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=uri@jdland.co.il \
/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;
as well as URLs for NNTP newsgroup(s).