From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 Aug 2018 17:00:15 +0000 (-0700)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v4.19~499
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=112cbae26d18e75098d95cc234cfa5059de8d479;p=platform%2Fkernel%2Flinux-rpi3.git

Merge branch 'linus' of git://git./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
---

112cbae26d18e75098d95cc234cfa5059de8d479