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

[Arnd Bergmann]

On Fri, Dec 17, 2021 at 7:29 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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, looks good. There are potentially three or four new SoC families
in the arm/newsoc branch (this is the first one I merged), so I expect to see
a few additional conflicts like this against pinctrl/clk/irqchip, but
they should
all be trivial.

        Arnd