Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753331Ab3CXLam (ORCPT ); Sun, 24 Mar 2013 07:30:42 -0400 Received: from sd-mail-sa-01.sanoma.fi ([158.127.18.161]:38532 "EHLO sd-mail-sa-01.sanoma.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753243Ab3CXLal (ORCPT ); Sun, 24 Mar 2013 07:30:41 -0400 Message-ID: <514EE3DD.6060102@iki.fi> Date: Sun, 24 Mar 2013 13:30:37 +0200 From: Jussi Kivilinna User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130308 Thunderbird/17.0.4 MIME-Version: 1.0 To: Tim Chen CC: Herbert Xu , "H. Peter Anvin" , "David S.Miller" , Kirk Yap , David Cote , James Guilford , Wajdi Feghali , linux-kernel , linux-crypto@vger.kernel.org Subject: Re: [PATCH 06/11] Create module providing optimized SHA256 routines using SSSE3, AVX or AVX2 instructions. References: <1363987761.8972.60.camel@schen9-DESK> In-Reply-To: <1363987761.8972.60.camel@schen9-DESK> X-Enigmail-Version: 1.5.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1021 Lines: 24 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 > --- 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 majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/