Re: linux-next: manual merge of the gpio-brgl tree with the origin tree

[Geert Uytterhoeven]

Hi Mark,

On Wed, 12 Aug 2026 at 18:59, Mark Brown <broonie@xxxxxxxxxx> wrote:
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
>   drivers/gpio/gpio-by-pinctrl.c
>
> between commit:
>
>   67ff4bf723c8b ("gpio: gpio-by-pinctrl: Apply initial value in direction output wrapper")
>
> from the origin tree and commit:
>
>   408866669ce01 ("gpio: gpio-by-pinctrl: Apply initial value in direction output wrapper")
>
> from the gpio-brgl 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 for your resolution!

> --- a/drivers/gpio/gpio-by-pinctrl.c
> +++ b/drivers/gpio/gpio-by-pinctrl.c
> @@@ -54,11 -54,11 +54,11 @@@ static int pin_control_gpio_direction_o
>   {
>         int ret;
>
>  -      ret = pin_control_gpio_set(chip, offset, val);
>  +      ret = pinctrl_gpio_direction_output(chip, offset);
>         if (ret)
>                 return ret;
>
>  -      return pinctrl_gpio_direction_output(chip, offset);
>  +      return pin_control_gpio_set(chip, offset, val);
>   }
>
>   static int pin_control_gpio_probe(struct platform_device *pdev)

I think this is wrong: the origin tree has v2, while the gpio-brgl tree
has v3 of the same patch.

[v2] https://lore.kernel.org/20260724-gpio-pinctrl-output-set-val-v2-1-cad55d025636@xxxxxxxxxxxxxxxx/
[v3]https://lore.kernel.org/20260810-gpio-pinctrl-output-set-val-v3-1-8e35222b5c8c@xxxxxxxxxxxxxxxx/

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