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

[Geert Uytterhoeven]

Hi Linus,

On Fri, Oct 13, 2023 at 9:14 AM Linus Walleij <linus.walleij@xxxxxxxxxx> wrote:
> On Fri, Oct 13, 2023 at 9:10 AM Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> wrote:
> > 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?
>
> No, I'm not that vain...

I don't see any other difference, though:

$ git help diff-commits
'diff-commits' is aliased to '!bash -c "colordiff -up <(git show $1)
<(git show $2) | less -R" #'
$ git diff-commits 73394a1b2194 f055ff23c331
--- /dev/fd/63  2023-10-13 09:30:50.809415961 +0200
+++ /dev/fd/62  2023-10-13 09:30:50.809415961 +0200
@@ -1,4 +1,4 @@
-commit 73394a1b2194694b66f7a0839a219ce0d16b64a3
+commit f055ff23c331f28aa4ace4b72dc56f63b9a726c8
 Author: Ralph Siemsen <ralph.siemsen@xxxxxxxxxx>
 Date:   Wed Oct 4 16:00:08 2023 -0400

@@ -17,6 +17,7 @@ Date:   Wed Oct 4 16:00:08 2023 -0400
     Reviewed-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
     Link: https://lore.kernel.org/r/20231004200008.1306798-1-ralph.siemsen@xxxxxxxxxx
     Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
+    Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>

 diff --git a/drivers/pinctrl/renesas/Kconfig b/drivers/pinctrl/renesas/Kconfig
 index 77730dc548ed3c70..c8d519ca53eb7f31 100644

> > > 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?
>
> It's fine if you drop it and rebase from my side, I understand the
> hashes will be different but the content is the same so it is the
> same tested.
>
> But I guess there could be reasons for not to, so then we can
> live with it I guess.

OK, I'll drop it from renesas-pinctrl-for-v6.7. I don't have any other
changes touching the same file.

Thanks!

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