]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6e98b6b 7c0e43c)
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)
commite636cd2b0bb0df5692f6b9b96c6d7bb35f01d240
tree95e821540e945a1dfc1ab55dc3b5015eefb15d64tree | snapshot
parent6e98b6b1df9c873cf38fe002ad1c5fdce435cfb3commit | diff
parent7c0e43c92c309eaaaac002467df2496af50440dacommit | diff
Merge branch 'linus' of git://git.kernel.org/pub/scm/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
Linux Kernel Source Tree.