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

[Bartosz Golaszewski]

On Mon, 3 Mar 2025 at 06:57, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
>   drivers/gpio/gpiolib.c
>
> between commit:
>
>   64407f4b5807 ("gpiolib: Fix Oops in gpiod_direction_input_nonotify()")
>
> from the gpio-brgl-fixes tree and commit:
>
>   e623c4303ed1 ("gpiolib: sanitize the return value of gpio_chip::get_direction()")
>
> from the gpio-brgl tree.
>
> I fixed it up (I think - 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.
>
> --
> Cheers,
> Stephen Rothwell
>

Hi Stephen!

Thanks, I pulled in v6.14-rc5 into my for-next branch and fixed the
conflicts there, next should be fine tomorrow.

Bartosz