Subject: linux-next: manual merge of the gpio-brgl tree with the arm-soc-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 8 Aug 2025 12:20:15 +1000

Hi all,

Today's linux-next merge of the gpio-brgl tree got a conflict in:

  arch/arm/mach-s3c/gpio-samsung.c

between commit:

  3dca3d51b933 ("ARM: s3c/gpio: complete the conversion to new GPIO value setters")

from the arm-soc-fixes tree and commit:

  d9d87d90cc0b ("treewide: rename GPIO set callbacks back to their original names")

from the gpio-brgl tree.

I fixed it up (I just used the latter) 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