Re: linux-next: duplicate patch in the pinctrl tree

[Geert Uytterhoeven]

Hi Linus,

On Fri, Oct 13, 2023 at 12:44 AM Linus Walleij <linus.walleij@xxxxxxxxxx> wrote:
> On Fri, Oct 13, 2023 at 12:18 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxx

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