From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linus Walleij <linus.walleij@linaro.org>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the pinctrl tree with the arm-soc tree
Date: Tue, 6 Dec 2022 17:04:43 +0200 [thread overview]
Message-ID: <Y49aC6dMyoAMcTkd@smile.fi.intel.com> (raw)
In-Reply-To: <20221206121336.474457bb@canb.auug.org.au>
On Tue, Dec 06, 2022 at 12:13:36PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the pinctrl tree got a conflict in:
>
> drivers/soc/fsl/qe/gpio.c
>
> between commits:
>
> 84582f9ed090 ("soc: fsl: qe: Avoid using gpio_to_desc()")
> 66310b5a0fc1 ("soc: fsl: qe: request pins non-exclusively")
>
> from the arm-soc tree and commit:
>
> c9eb6e546a23 ("soc: fsl: qe: Switch to use fwnode instead of of_node")
>
> 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.
That's correct fix in my opinion. Thank you!
How to avoid conflict and why it's there I have explained here:
https://lore.kernel.org/linux-arm-kernel/Y43ij5rwNLOaztch@smile.fi.intel.com/
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2022-12-06 15:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-06 1:13 linux-next: manual merge of the pinctrl tree with the arm-soc tree Stephen Rothwell
2022-12-06 15:04 ` Andy Shevchenko [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-12 7:55 Stephen Rothwell
2024-09-12 12:10 ` Arnd Bergmann
2022-11-18 5:06 Stephen Rothwell
2021-12-17 6:29 Stephen Rothwell
2021-12-17 8:02 ` Arnd Bergmann
2021-12-17 11:02 ` Andy Shevchenko
2017-01-31 5:29 Stephen Rothwell
2014-11-10 6:34 Stephen Rothwell
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=Y49aC6dMyoAMcTkd@smile.fi.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=arnd@arndb.de \
--cc=dmitry.torokhov@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).