From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Jun 2016 17:59:53 +0000 (-0700)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5b7452c840ad085e5ca1bb5b5a23a18e6d5b0c33;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes the following issues:

   - Missing length check for user-space GETALG request
   - Bogus memmove length in ux500 driver
   - Incorrect priority setting for vmx driver
   - Incorrect ABI selection for vmx driver"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: user - re-add size check for CRYPTO_MSG_GETALG
  crypto: ux500 - memmove the right size
  crypto: vmx - Increase priority of aes-cbc cipher
  crypto: vmx - Fix ABI detection
---

5b7452c840ad085e5ca1bb5b5a23a18e6d5b0c33