Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Browse source

Merge crypto-2.6 to resolve caam conflict with skcipher conversion.

...

This commit is contained in:

Herbert Xu 2018-09-21 13:22:37 +08:00

parent 41a9aca6a2 13cc6f48c7

commit 910e3ca10b

6 changed files with 2 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/x86/crypto/aegis128-aesni-glue.c

View file

1

arch/x86/crypto/aegis128l-aesni-glue.c

View file

1

arch/x86/crypto/aegis256-aesni-glue.c

View file

1

arch/x86/crypto/morus1280-sse2-glue.c

View file

1

arch/x86/crypto/morus640-sse2-glue.c

View file

4

drivers/crypto/caam/caamalg.c

View file