Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
MIME-Version: 1.0
References: <20231211145056.23fbfd7d@canb.auug.org.au> <CACMJSetGz1fCnqS_HPTLyV8dOWOUtO07-bZKKXu3=3Lk2PGdyw@mail.gmail.com>
 <ZXcRMTFitYohcFfS@smile.fi.intel.com>
In-Reply-To: <ZXcRMTFitYohcFfS@smile.fi.intel.com>
From:   Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Date:   Mon, 11 Dec 2023 15:04:09 +0100
Message-ID: <CACMJSeun5bCUwkVZPXpc5mKqyj_XztUHTXafuz5Psc_8LCKkuA@mail.gmail.com>
Subject: Re: linux-next: manual merge of the pinctrl-intel tree with the
 gpio-brgl tree
To:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc:     Linus Walleij <linus.walleij@linaro.org>,
        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>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Mon, 11 Dec 2023 at 14:40, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> 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@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?
>

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
>
>