Re: [PATCH 01/11] ARM: defconfig: reorder defconfig files

From: Geert Uytterhoeven
Date: Fri Aug 19 2022 - 05:18:05 EST


Hi Arnd,

On Thu, Aug 18, 2022 at 3:55 PM Arnd Bergmann <arnd@xxxxxxxxxx> wrote:
> From: Arnd Bergmann <arnd@xxxxxxxx>
>
> The debug-info and can subystem options have moved around in the
> 'savedefconfig' output, so fix these up to reduce the clutter
> from the savedefconfig command.
>
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>

Thanks for your patch!

> --- a/arch/arm/configs/shmobile_defconfig
> +++ b/arch/arm/configs/shmobile_defconfig
> @@ -33,7 +33,6 @@ CONFIG_INET=y
> CONFIG_IP_PNP=y
> CONFIG_IP_PNP_DHCP=y
> CONFIG_CAN=y
> -CONFIG_CAN_RCAR=y
> CONFIG_PCI=y
> CONFIG_PCI_MSI=y
> CONFIG_PCI_RCAR_GEN2=y
> @@ -57,6 +56,7 @@ CONFIG_RAVB=y
> CONFIG_SMSC911X=y
> CONFIG_MICREL_PHY=y
> CONFIG_SMSC_PHY=y
> +CONFIG_CAN_RCAR=y
> CONFIG_INPUT_EVDEV=y
> CONFIG_KEYBOARD_GPIO=y
> # CONFIG_INPUT_MOUSE is not set

This may cause conflicts with the usual refresh I plan to do for
v6.0-rc1, which will be very similar to
https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git/commit/?id=517d634d376042ab797d9feeb94236ad4cb03396
So it may be better to drop this part.

However, that decision is up to you, as you will have to handle the
conflict when merging renesas-arm-defconfig-for-v6.0-tag1 later ;-)
But sfr might complain before...

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds