On Tue, May 18, 2021 at 3:19 AM Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> wrote: > On Tue, May 18, 2021 at 01:53:56AM +0200, Linus Walleij wrote: > > On Wed, May 5, 2021 at 10:26 PM Corentin Labbe <clabbe@xxxxxxxxxxxx> wrote: > > > > > Loading the ixp4xx crypto driver exhibits lots of error. > > > All algorithm fail selftests with different reasons. > > > This series start to fixes some of thoses problem. > > > > Excellent! Thanks for taking over this Corentin!! > > FWIW: > > Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxx> > > > > If I merge my 3 additional patches through ARM SoC > > will it work out or do I need to think about some clever > > merging strategy? > > Well if your patches don't touch the drivers/crypto then there > shouldn't be any conflicts. Sadly they do, it's these: https://lore.kernel.org/linux-crypto/20210510213634.600866-1-linus.walleij@xxxxxxxxxx/ https://lore.kernel.org/linux-crypto/20210510213634.600866-2-linus.walleij@xxxxxxxxxx/ https://lore.kernel.org/linux-crypto/20210510213634.600866-3-linus.walleij@xxxxxxxxxx/ I guess we could turn it around: I see if I can apply these two on top of the crypto tree and resend then we hope there is no collision in the ARM SoC tree instead. I need to respin the series anyway so shall we try this? Yours, Linus Walleij
