From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jerin Jacob <jerin.jacob@caviumnetworks.com>
Subject: Re: [PATCH v4 7/7] app/test: add ARMv8 crypto tests and
	test vectors
Date: Wed, 18 Jan 2017 07:56:52 +0530
Message-ID: <20170118022651.GB2951@localhost.localdomain>
References: <1483551207-18236-4-git-send-email-zbigniew.bodek@caviumnetworks.com>
 <1484668143-32522-1-git-send-email-zbigniew.bodek@caviumnetworks.com>
 <1484668143-32522-8-git-send-email-zbigniew.bodek@caviumnetworks.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Cc: <dev@dpdk.org>, <pablo.de.lara.guarch@intel.com>,
 <declan.doherty@intel.com>, <jianbo.liu@linaro.org>, <hemant.agrawal@nxp.com>
To: <zbigniew.bodek@caviumnetworks.com>
Return-path: <dev-bounces@dpdk.org>
Received: from NAM03-CO1-obe.outbound.protection.outlook.com
 (mail-co1nam03on0076.outbound.protection.outlook.com [104.47.40.76])
 by dpdk.org (Postfix) with ESMTP id 3AFA4108F
 for <dev@dpdk.org>; Wed, 18 Jan 2017 03:27:14 +0100 (CET)
Content-Disposition: inline
In-Reply-To: <1484668143-32522-8-git-send-email-zbigniew.bodek@caviumnetworks.com>
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

On Tue, Jan 17, 2017 at 04:49:03PM +0100, zbigniew.bodek@caviumnetworks.com wrote:
> From: Zbigniew Bodek <zbigniew.bodek@caviumnetworks.com>
> 
> Introduce unit tests for ARMv8 crypto PMD.
> Add test vectors for short cases such as 160 bytes.
> These test cases are ARMv8 specific since the code provides
> different processing paths for different input data sizes.
> 
> User can validate correctness of algorithms' implementation using:
> * cryptodev_sw_armv8_autotest
> For performance test one can use:
> * cryptodev_sw_armv8_perftest

Could you please rebase to latest dpdk-next-crypto HEAD.

➜ [master][dpdk-next-crypto] $ git am -3 dpdk-dev-v4-7-7-app-test-add-ARMv8-crypto-tests-and-test-vectors.patch
Applying: app/test: add ARMv8 crypto tests and test vectors
Using index info to reconstruct a base tree...
M       app/test/test_cryptodev.c
M       app/test/test_cryptodev_aes_test_vectors.h
M       app/test/test_cryptodev_blockcipher.c
M       app/test/test_cryptodev_blockcipher.h
M       app/test/test_cryptodev_perf.c
Falling back to patching base and 3-way merge...
Auto-merging app/test/test_cryptodev_perf.c
Auto-merging app/test/test_cryptodev_blockcipher.h
Auto-merging app/test/test_cryptodev_blockcipher.c
Auto-merging app/test/test_cryptodev_aes_test_vectors.h
CONFLICT (content): Merge conflict in
app/test/test_cryptodev_aes_test_vectors.h
Auto-merging app/test/test_cryptodev.c
Failed to merge in the changes.
Patch failed at 0001 app/test: add ARMv8 crypto tests and test vectors
The copy of the patch that failed is found in:
   /home/jerin/dpdk-next-crypto/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".