Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto...
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 01:06:55 +0000 (12:06 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 01:06:55 +0000 (12:06 +1100)
commit6cf4e2ec8180bf7db1c6c9b94ed2a3cdb76bd31f
treef8b92c7f395b923edebcd8d7db1f784b04b3dd96
parent2cd5545e69ffcee887fb24cff21b75469649f34e
parent0a2a464f863187f97e96ebc6384c052cafd4a54c
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