From: Mark Brown <broonie@kernel•org>
To: Linus Walleij <linus.walleij@linaro•org>
Cc: Hans Verkuil <hverkuil-cisco@xs4all•nl>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the pinctrl tree with the origin tree
Date: Thu, 4 May 2023 22:41:40 +0900 [thread overview]
Message-ID: <20230504134140.186048-1-broonie@kernel.org> (raw)
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
next reply other threads:[~2023-05-04 13:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-04 13:41 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-05-04 13:42 linux-next: manual merge of the pinctrl tree with the origin tree Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230504134140.186048-1-broonie@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=hverkuil-cisco@xs4all$(echo .)nl \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox