From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Dec 2015 18:44:41 +0000 (-0800)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v4.4-rc8~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8513342170278468bac126640a5d2d12ffbff106;p=platform%2Fkernel%2Flinux-exynos.git

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

Pull crypto fix from Herbert Xu:
 "This fixes a bug in the algif_skcipher interface that can trigger a
  kernel WARN_ON from user-space.  It does so by using the new skcipher
  interface which unlike the previous ablkcipher does not need to create
  extra geniv objects which is what was used to trigger the WARN_ON"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: algif_skcipher - Use new skcipher interface
---

8513342170278468bac126640a5d2d12ffbff106