Subject: Re: linux-next: manual merge of the pinctrl tree with the arm-soc tree

From: "Arnd Bergmann" <[email-masked]>
Date: Thu, 12 Sep 2024 12:10:03 +0000

On Thu, Sep 12, 2024, at 07:55, Stephen Rothwell wrote:
> --- a/drivers/pinctrl/Makefile
> +++ b/drivers/pinctrl/Makefile
> @@@ -22,8 -22,8 +22,9 @@@ obj-$(CONFIG_PINCTRL_CY8C95X0)	+= pinct
>   obj-$(CONFIG_PINCTRL_DA850_PUPD) += pinctrl-da850-pupd.o
>   obj-$(CONFIG_PINCTRL_DA9062)	+= pinctrl-da9062.o
>   obj-$(CONFIG_PINCTRL_DIGICOLOR)	+= pinctrl-digicolor.o
> - obj-$(CONFIG_PINCTRL_EQUILIBRIUM)   += pinctrl-equilibrium.o
>  +obj-$(CONFIG_PINCTRL_EP93XX)	+= pinctrl-ep93xx.o
> + obj-$(CONFIG_PINCTRL_EQUILIBRIUM)   += pinctrl-equilibrium.o
> + obj-$(CONFIG_PINCTRL_EYEQ5)	+= pinctrl-eyeq5.o
>   obj-$(CONFIG_PINCTRL_GEMINI)	+= pinctrl-gemini.o
>   obj-$(CONFIG_PINCTRL_INGENIC)	+= pinctrl-ingenic.o
>   obj-$(CONFIG_PINCTRL_K210)	+= pinctrl-k210.o

Looks good, I did the same merge when testing this.

Thanks,

      Arnd