On 22.03.2013 23:29, Tim Chen wrote: > We added glue code and config options to create crypto > module that uses SSE/AVX/AVX2 optimized SHA256 x86_64 assembly routines. > > Signed-off-by: Tim Chen <tim.c.c...@linux.intel.com> > ---
I could not apply this patch cleanly on top of cryptodev-2.6 tree: Applying: Create module providing optimized SHA256 routines using SSSE3, AVX or AVX2 instructions. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging crypto/Kconfig Auto-merging arch/x86/crypto/Makefile CONFLICT (content): Merge conflict in arch/x86/crypto/Makefile Failed to merge in the changes. Patch failed at 0006 Create module providing optimized SHA256 routines using SSSE3, AVX or AVX2 instructions. -Jussi -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
