On Mon, 11 Dec 2023 at 14:40, Andy Shevchenko
<andriy.shevchenko@xxxxxxxxxxxxxxx> wrote:
>
> +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@xxxxxxxxxxxxxxxx> 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@xxxxxxxx/
>
> I can do it, but why?
>
You were the one who asked me to put these commits into an immutable
branch in the first place to avoid conflicts with the baytrail branch.
:)
Bartosz
> 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
>
>
