diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-09 10:00:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-09 10:00:15 -0700 |
| commit | 112cbae26d18e75098d95cc234cfa5059de8d479 (patch) | |
| tree | 8e96670829cbbe668330d364265dfcee511f6182 /net/llc | |
| parent | 6395ad8559f3a8f4299c027175db00cde67849f7 (diff) | |
| parent | 877ccce7cbe8409256616f5e6bdedb08ce2e82db (diff) | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu:
"This fixes a performance regression in arm64 NEON crypto as well as a
crash in x86 aegis/morus on unsupported CPUs"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: x86/aegis,morus - Fix and simplify CPUID checks
crypto: arm64 - revert NEON yield for fast AEAD implementations
Diffstat (limited to 'net/llc')
0 files changed, 0 insertions, 0 deletions