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@xxxxxxxxxxxxxxxx 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: * /---------------------------------------\ -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html