* linux-next: manual merge of the pinctrl tree with the origin tree
@ 2023-05-04 13:42 Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2023-05-04 13:42 UTC (permalink / raw)
To: Linus Walleij
Cc: Hans Verkuil, Linux Kernel Mailing List, Linux Next Mailing List
Hi all,
Today's linux-next merge of the pinctrl tree got a conflict in:
drivers/pinctrl/pinctrl-at91-pio4.c
between commit:
348551ddaf311 ("Merge tag 'pinctrl-v6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl")
from the origin tree and commit:
b7badd752de05 ("pinctrl-bcm2835.c: fix race condition when setting gpio dir")
from the pinctrl 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/pinctrl/pinctrl-at91-pio4.c
index 2fe40acb6a3e5,e40487be20386..0000000000000
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
^ permalink raw reply [flat|nested] 2+ messages in thread* linux-next: manual merge of the pinctrl tree with the origin tree
@ 2023-05-04 13:41 Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2023-05-04 13:41 UTC (permalink / raw)
To: Linus Walleij
Cc: Hans Verkuil, Linux Kernel Mailing List, Linux Next Mailing List
Hi all,
Today's linux-next merge of the pinctrl tree got a conflict in:
drivers/pinctrl/pinctrl-at91-pio4.c
between commit:
348551ddaf311 ("Merge tag 'pinctrl-v6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl")
from the origin tree and commit:
b7badd752de05 ("pinctrl-bcm2835.c: fix race condition when setting gpio dir")
from the pinctrl 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/pinctrl/pinctrl-at91-pio4.c
index 2fe40acb6a3e5,e40487be20386..0000000000000
--- a/drivers/pinctrl/pinctrl-at91-pio4.c
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-04 13:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-04 13:42 linux-next: manual merge of the pinctrl tree with the origin tree Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2023-05-04 13:41 Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox