tree 9241ea523ab870dac7e3e89d4844bcb2797f1cca
parent 2c7143d4f5cd5c31c7ebe7aa57b273145cdb1808
parent 0d96e4bab2855a030077cc695a3563fd7cb0e7d8
author Linus Torvalds <torvalds@linux-foundation.org> 1451328281 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1451328281 -0800

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 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