Re: [GIT PULL 3/4] ARM: defconfig updates

From: Linus Torvalds
Date: Fri Apr 03 2020 - 18:17:41 EST


On Fri, Apr 3, 2020 at 2:36 PM Arnd Bergmann <arnd@xxxxxxxx> wrote:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
> tags/arm-defconfig-5.7

This caused a conflict in 'omap2plus_defconfig'.

I resolved it, but honestly, I couldn't find it in myself to care that
deeply about a defconfig conflict.

So I think somebody might want to check it and maybe re-generate that
thing if it matter.

Linus