tree 8e96670829cbbe668330d364265dfcee511f6182
parent 6395ad8559f3a8f4299c027175db00cde67849f7
parent 877ccce7cbe8409256616f5e6bdedb08ce2e82db
author Linus Torvalds <torvalds@linux-foundation.org> 1533834015 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1533834015 -0700

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