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

From: Andy Shevchenko <andy.shevchenko@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linus Walleij <linus.walleij@linaro.org>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	ARM <linux-arm-kernel@lists.infradead.org>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Drew Fustini <drew@beagleboard.org>,
	Emil Renner Berthing <kernel@esmil.dk>,
	Huan Feng <huan.feng@starfivetech.com>,
	Kiran Kumar S <kiran.kumar1.s@intel.com>,
	Lakshmi Sowjanya D <lakshmi.sowjanya.d@intel.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the pinctrl tree with the arm-soc tree
Date: Fri, 17 Dec 2021 13:02:05 +0200	[thread overview]
Message-ID: <CAHp75Vd9O=A9_N=KLDV2mJ2haFybNqnSL2AdByf4Pc6zjjD94w@mail.gmail.com> (raw)
In-Reply-To: <20211217172931.01c24d4b@canb.auug.org.au>

On Fri, Dec 17, 2021 at 12:29 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the pinctrl tree got conflicts in:
>
>   drivers/pinctrl/Kconfig
>   drivers/pinctrl/Makefile
>
> between commit:
>
>   ec648f6b7686 ("pinctrl: starfive: Add pinctrl driver for StarFive SoCs")
>
> from the arm-soc tree and commits:
>
>   12422af8194d ("pinctrl: Add Intel Thunder Bay pinctrl driver")
>   b124c8bd50c7 ("pinctrl: Sort Kconfig and Makefile entries alphabetically")
>
> from the pinctrl tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks!
To me it seems like a correct fix.

> diff --cc drivers/pinctrl/Kconfig
> index 0d5b61e4c21e,c27c9ee89f0e..000000000000
> --- a/drivers/pinctrl/Kconfig
> +++ b/drivers/pinctrl/Kconfig
> diff --cc drivers/pinctrl/Makefile
> index f5bdd6b209a6,6be6c3fc6663..000000000000
> --- a/drivers/pinctrl/Makefile
> +++ b/drivers/pinctrl/Makefile
> @@@ -30,26 -39,16 +39,17 @@@ obj-$(CONFIG_PINCTRL_OXNAS)        += pinctrl-
>   obj-$(CONFIG_PINCTRL_PALMAS)  += pinctrl-palmas.o
>   obj-$(CONFIG_PINCTRL_PIC32)   += pinctrl-pic32.o
>   obj-$(CONFIG_PINCTRL_PISTACHIO)       += pinctrl-pistachio.o
> + obj-$(CONFIG_PINCTRL_RK805)   += pinctrl-rk805.o
>   obj-$(CONFIG_PINCTRL_ROCKCHIP)        += pinctrl-rockchip.o
>   obj-$(CONFIG_PINCTRL_SINGLE)  += pinctrl-single.o
> - obj-$(CONFIG_PINCTRL_SX150X)  += pinctrl-sx150x.o
> - obj-$(CONFIG_ARCH_TEGRA)      += tegra/
> - obj-$(CONFIG_PINCTRL_XWAY)    += pinctrl-xway.o
> - obj-$(CONFIG_PINCTRL_LANTIQ)  += pinctrl-lantiq.o
> - obj-$(CONFIG_PINCTRL_LPC18XX) += pinctrl-lpc18xx.o
> - obj-$(CONFIG_PINCTRL_TB10X)   += pinctrl-tb10x.o
> + obj-$(CONFIG_PINCTRL_STMFX)   += pinctrl-stmfx.o
>   obj-$(CONFIG_PINCTRL_ST)      += pinctrl-st.o
>  +obj-$(CONFIG_PINCTRL_STARFIVE)        += pinctrl-starfive.o
> - obj-$(CONFIG_PINCTRL_STMFX)   += pinctrl-stmfx.o
> - obj-$(CONFIG_PINCTRL_ZYNQ)    += pinctrl-zynq.o
> + obj-$(CONFIG_PINCTRL_SX150X)  += pinctrl-sx150x.o
> + obj-$(CONFIG_PINCTRL_TB10X)   += pinctrl-tb10x.o
> + obj-$(CONFIG_PINCTRL_THUNDERBAY) += pinctrl-thunderbay.o
>   obj-$(CONFIG_PINCTRL_ZYNQMP)  += pinctrl-zynqmp.o
> - obj-$(CONFIG_PINCTRL_INGENIC) += pinctrl-ingenic.o
> - obj-$(CONFIG_PINCTRL_RK805)   += pinctrl-rk805.o
> - obj-$(CONFIG_PINCTRL_OCELOT)  += pinctrl-ocelot.o
> - obj-$(CONFIG_PINCTRL_MICROCHIP_SGPIO) += pinctrl-microchip-sgpio.o
> - obj-$(CONFIG_PINCTRL_EQUILIBRIUM)   += pinctrl-equilibrium.o
> - obj-$(CONFIG_PINCTRL_K210)    += pinctrl-k210.o
> - obj-$(CONFIG_PINCTRL_KEEMBAY) += pinctrl-keembay.o
> + obj-$(CONFIG_PINCTRL_ZYNQ)    += pinctrl-zynq.o
>
>   obj-y                         += actions/
>   obj-$(CONFIG_ARCH_ASPEED)     += aspeed/

-- 
With Best Regards,
Andy Shevchenko