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

From: Bartosz Golaszewski

Date: Tue Nov 17 2026 - 03:17:14 EST


On Mon, Nov 16, 2026 at 08:09:53PM +0000, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
> drivers/gpio/gpiolib-shared.c
>
> between commit:
>
> 7d1d799d6251b ("gpio: shared: use atomic set_bit() for descriptor flags")
>
> from the gpio-brgl-fixes tree and commits:
>
> c402fd2961dd0 ("gpio: shared: factor out per-entry teardown helper")
> cda42ff53c4b5 ("gpio: shared: factor out per-entry setup helper")
>
> 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.
>
> diff --cc drivers/gpio/gpiolib-shared.c
> index f34315a2059a2,cbb68ad646498..0000000000000
> --- a/drivers/gpio/gpiolib-shared.c
> +++ b/drivers/gpio/gpiolib-shared.c
> @@@ -532,7 -643,8 +643,7 @@@ int gpiochip_setup_shared(struct gpio_c
> * This is a shared GPIO proxy. Mark its
> * descriptor as such and return here.
> */
> - set_bit(GPIOD_FLAG_SHARED_PROXY, &gdev->descs[0].flags);
> - __set_bit(GPIOD_FLAG_SHARED_PROXY,
> - &gdev->descs[0].flags);
> ++ __set_bit(GPIOD_FLAG_SHARED_PROXY, &gdev->descs[0].flags);

This should actually keep the atomic set_bit(). In any case, I will send
a PR with fixes to Torvalds this week and pull back v7.4-rc4 into
gpio/for-next once tagged.

Thanks,
Bartosz