projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a4e6f95 0e14ef3)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Sep 2021 14:37:46 +0000 (07:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Sep 2021 14:37:46 +0000 (07:37 -0700)
Pull crypto fixes from Herbert Xu:
 "This contains fixes for a resource leak in ccp as well as stack
  corruption in x86/sm4"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: x86/sm4 - Fix frame pointer stack corruption
  crypto: ccp - fix resource leaks in ccp_run_aes_gcm_cmd()


Trivial merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git