Messages in this thread | | | Date | Mon, 11 Dec 2023 15:40:01 +0200 | From | Andy Shevchenko <> | 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@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
| |