Re: linux-next: manual merge of the akpm-current tree with the crypto tree

Hi all, On Fri, 17 Jul 2020 20:14:11 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > drivers/crypto/mediatek/mtk-aes.c > > between commit: > > f441ba2ad341 ("crypto: mediatek - use AES library for GCM key derivation") > > from th

linux-next: manual merge of the akpm-current tree with the crypto tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: drivers/crypto/mediatek/mtk-aes.c between commit: f441ba2ad341 ("crypto: mediatek - use AES library for GCM key derivation") from the crypto tree and commit: 161f6a5cc3ea ("mm, treewide: rename kzfree() to kfre