* linux-next: manual merge of the gpio-brgl tree with the arm-soc-fixes tree
@ 2025-08-08 2:20 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2025-08-08 2:20 UTC (permalink / raw)
To: Bartosz Golaszewski, Arnd Bergmann
Cc: Bartosz Golaszewski, ARM, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 804 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-08-08 2:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-08 2:20 linux-next: manual merge of the gpio-brgl tree with the arm-soc-fixes tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).