Re: [dpdk-dev] [PATCH v4 7/7] app/test: add ARMv8 crypto tests and test vectors

[Jerin Jacob <jerin.jacob@caviumnetworks.com>]

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".