From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Dec 2018 21:07:10 +0000 (-0800)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v5.4-rc1~2095
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52ab2ec00518a164884c5670932557cd868b0193;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull crypto fixes from Herbert Xu:

 - Disable the new crypto stats interface as it's still being changed

 - Fix potential uses-after-free in cbc/cfb/pcbc.

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: user - Disable statistics interface
  crypto: do not free algorithm before using
---

52ab2ec00518a164884c5670932557cd868b0193