Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto...
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Feb 2022 00:29:27 +0000 (11:29 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Feb 2022 00:29:27 +0000 (11:29 +1100)
commit84b2c260671b7a221f49994b15dbe955b71198e2
tree619c1cecd9181eb5d964572fad151a9031086941
parente4b188cb11af06cade71c9a7aac45270a234673b
parenta69cb445f7d129abf7c50d48c8a8eca7c8d5df15
Merge branch 'master' of git://git./linux/kernel/git/herbert/cryptodev-2.6.git
crypto/algapi.c
drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c