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: <20231013091831.60a032c2@canb.auug.org.au> <CACRpkdaEVUfFg-O53NBiyWPsjx0VZVMKK7o2ikUMSCy0_AJUGQ@mail.gmail.com>
In-Reply-To: <CACRpkdaEVUfFg-O53NBiyWPsjx0VZVMKK7o2ikUMSCy0_AJUGQ@mail.gmail.com>
From:   Geert Uytterhoeven <geert@linux-m68k.org>
Date:   Fri, 13 Oct 2023 09:10:11 +0200
Message-ID: <CAMuHMdX3LXZiRRAHSb1FU6nrgtPnyewbUwp7R9Rw2zbxziYz7w@mail.gmail.com>
Subject: Re: linux-next: duplicate patch in the pinctrl tree
To:     Linus Walleij <linus.walleij@linaro.org>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Ralph Siemsen <ralph.siemsen@linaro.org>,
        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"
Content-Transfer-Encoding: 8BIT
Precedence: bulk

Hi Linus,

On Fri, Oct 13, 2023 at 12:44 AM Linus Walleij <linus.walleij@linaro.org> wrote:
> On Fri, Oct 13, 2023 at 12:18 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > The following commit is also in Linus Torvalds' tree as a different commit
> > (but the same patch):
> >
> >   73394a1b2194 ("pinctrl: renesas: rzn1: Enable missing PINMUX")
> >
> > This is commit
> >
> >   f055ff23c331 ("pinctrl: renesas: rzn1: Enable missing PINMUX")
> >
> > in Linus' tree.
>
> I had to fix up the commit message, sorry,

The only difference is your added SoB?

> I'll rebuild my branch for -next.

I'm afraid that won't help, as the original one (from
renesas-pinctrl-fixes-for-v6.6) is also part of
renesas-pinctrl-for-v6.7, which I'm gonna send you a PR for later today.

I guess we'll just have to live with it?

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds