From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>,
Linus Walleij <linus.walleij@linaro.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Bartosz Golaszewski <brgl@bgdev.pl>,
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-intel tree with the gpio-brgl tree
Date: Mon, 11 Dec 2023 15:40:01 +0200 [thread overview]
Message-ID: <ZXcRMTFitYohcFfS@smile.fi.intel.com> (raw)
In-Reply-To: <CACMJSetGz1fCnqS_HPTLyV8dOWOUtO07-bZKKXu3=3Lk2PGdyw@mail.gmail.com>
+Cc: Linus W.
On Mon, Dec 11, 2023 at 09:15:30AM +0100, Bartosz Golaszewski wrote:
> On Mon, 11 Dec 2023 at 04:51, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Today's linux-next merge of the pinctrl-intel tree got a conflict in:
> >
> > drivers/pinctrl/intel/pinctrl-baytrail.c
> >
> > between commit:
> >
> > c73505c8a001 ("pinctrl: baytrail: use gpiochip_dup_line_label()")
> >
> > from the gpio-brgl tree and commit:
> >
> > 6191e49de389 ("pinctrl: baytrail: Simplify code with cleanup helpers")
> >
> > from the pinctrl-intel tree.
...
> Andy, please pull the following into your baytrail tree:
> https://lore.kernel.org/lkml/20231208083650.25015-1-brgl@bgdev.pl/
I can do it, but why?
Conflicts is a normal practice during kernel development. And I believe this
particular one will be solved by Linus W.
Stephen, resolution looks correct to me, thank you.
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2023-12-11 13:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-11 3:50 linux-next: manual merge of the pinctrl-intel tree with the gpio-brgl tree Stephen Rothwell
2023-12-11 8:15 ` Bartosz Golaszewski
2023-12-11 13:40 ` Andy Shevchenko [this message]
2023-12-11 14:04 ` Bartosz Golaszewski
2023-12-11 14:48 ` Andy Shevchenko
2023-12-11 14:51 ` Andy Shevchenko
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=ZXcRMTFitYohcFfS@smile.fi.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=bartosz.golaszewski@linaro.org \
--cc=brgl@bgdev.pl \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.