projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7b24f6c e61efff)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Dec 2018 21:07:10 +0000 (13:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Dec 2018 21:07:10 +0000 (13:07 -0800)
commit52ab2ec00518a164884c5670932557cd868b0193
tree95e821540e945a1dfc1ab55dc3b5015eefb15d64tree | snapshot
parent7b24f6c082b3777749ccd19c9beb8643fa718480commit | diff
parente61efff4ae94f4509707a5e03f8edb6455f490e1commit | diff
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
John Crispins staging tree