* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> [230109 22:57]:
> Hi all,
>
> Today's linux-next merge of the omap tree got a conflict in:
>
> arch/arm/mach-omap1/Kconfig
>
> between commit:
>
> 67d3928c3df5 ("ARM: omap1: remove unused board files")
>
> from the arm-soc tree and commit:
>
> 609c1fabc7c5 ("ARM: omap1: Kconfig: Fix indentation")
>
> from the omap tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks, I just dropped "ARM: omap1: remove unused board files" to
simplify things.
Juerg, care to update and resend in a few weeks after v6.3-rc1
after the omap1 clean-up patches are merged?
Regards,
Tony
