[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <ZXcRMTFitYohcFfS@smile.fi.intel.com>
Date: Mon, 11 Dec 2023 15:40:01 +0200
From: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To: Bartosz Golaszewski <bartosz.golaszewski@...aro.org>,
Linus Walleij <linus.walleij@...aro.org>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>,
Bartosz Golaszewski <brgl@...ev.pl>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the pinctrl-intel tree with the
gpio-brgl tree
+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@...b.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
Powered by blists - more mailing lists