linux-kernel - linux-next: manual merge of the crypto tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20100414114856.54e1cb21.sfr@canb.auug.org.au>
Date:	Wed, 14 Apr 2010 11:48:56 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Herbert Xu <herbert@...dor.apana.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Uri Simchoni <uri@...and.co.il>
Subject: linux-next: manual merge of the crypto tree with Linus' tree

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@...b.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:
   *   /---------------------------------------\
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/