From: Linus Torvalds Date: Wed, 22 Dec 2021 18:02:08 +0000 (-0800) Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 X-Git-Tag: howlett/maple/20220722_2~1592 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e19e226345196649e83d49c6997e806a8ecdafe6;p=users%2Fjedix%2Flinux-maple.git Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 Pull crypto fix from Herbert Xu: "Fix a regression in the qat driver" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: qat - do not handle PFVF sources for qat_4xxx --- e19e226345196649e83d49c6997e806a8ecdafe6