* linux-next: duplicate patch in the pinctrl tree
@ 2024-11-07 10:48 Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2024-11-07 10:48 UTC (permalink / raw)
To: Linus Walleij, Lee Jones
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 360 bytes --]
Hi all,
The following commit is also in the mfd tree as a different commit
(but the same patch):
50dedb1eb1e6 ("dt-bindings: mfd: Add support for Airoha EN7581 GPIO System Controller")
This is commit
f49f37f3cfe1 ("dt-bindings: mfd: Add support for Airoha EN7581 GPIO System Controller")
in the mfd tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread* linux-next: duplicate patch in the pinctrl tree
@ 2023-10-12 22:18 Stephen Rothwell
2023-10-12 22:44 ` Linus Walleij
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2023-10-12 22:18 UTC (permalink / raw)
To: Linus Walleij
Cc: Geert Uytterhoeven, Ralph Siemsen, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
Hi all,
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: duplicate patch in the pinctrl tree
2023-10-12 22:18 Stephen Rothwell
@ 2023-10-12 22:44 ` Linus Walleij
2023-10-13 7:10 ` Geert Uytterhoeven
0 siblings, 1 reply; 7+ messages in thread
From: Linus Walleij @ 2023-10-12 22:44 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Geert Uytterhoeven, Ralph Siemsen, Linux Kernel Mailing List,
Linux Next Mailing List
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, I'll rebuild my branch for -next.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: duplicate patch in the pinctrl tree
2023-10-12 22:44 ` Linus Walleij
@ 2023-10-13 7:10 ` Geert Uytterhoeven
2023-10-13 7:14 ` Linus Walleij
0 siblings, 1 reply; 7+ messages in thread
From: Geert Uytterhoeven @ 2023-10-13 7:10 UTC (permalink / raw)
To: Linus Walleij
Cc: Stephen Rothwell, Ralph Siemsen, Linux Kernel Mailing List,
Linux Next Mailing List
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
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: duplicate patch in the pinctrl tree
2023-10-13 7:10 ` Geert Uytterhoeven
@ 2023-10-13 7:14 ` Linus Walleij
2023-10-13 7:37 ` Geert Uytterhoeven
0 siblings, 1 reply; 7+ messages in thread
From: Linus Walleij @ 2023-10-13 7:14 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Stephen Rothwell, Ralph Siemsen, Linux Kernel Mailing List,
Linux Next Mailing List
On Fri, Oct 13, 2023 at 9:10 AM Geert Uytterhoeven <geert@linux-m68k•org> wrote:
> 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?
No, I'm not that vain...
The merge commit got screwed up (random characters I don't know why).
So since it's just one patch I simply rebased the one patch to the top.
But if I do that, the tools will complain about "non-author signoff".
So I had to sign it off.
> > 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.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: duplicate patch in the pinctrl tree
2023-10-13 7:14 ` Linus Walleij
@ 2023-10-13 7:37 ` Geert Uytterhoeven
2023-10-13 8:58 ` Linus Walleij
0 siblings, 1 reply; 7+ messages in thread
From: Geert Uytterhoeven @ 2023-10-13 7:37 UTC (permalink / raw)
To: Linus Walleij
Cc: Stephen Rothwell, Ralph Siemsen, Linux Kernel Mailing List,
Linux Next Mailing List
Hi Linus,
On Fri, Oct 13, 2023 at 9:14 AM Linus Walleij <linus.walleij@linaro•org> wrote:
> On Fri, Oct 13, 2023 at 9:10 AM Geert Uytterhoeven <geert@linux-m68k•org> wrote:
> > 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?
>
> 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@linaro•org>
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@glider•be>
Link: https://lore.kernel.org/r/20231004200008.1306798-1-ralph.siemsen@linaro.org
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider•be>
+ Signed-off-by: Linus Walleij <linus.walleij@linaro•org>
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@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
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: duplicate patch in the pinctrl tree
2023-10-13 7:37 ` Geert Uytterhoeven
@ 2023-10-13 8:58 ` Linus Walleij
0 siblings, 0 replies; 7+ messages in thread
From: Linus Walleij @ 2023-10-13 8:58 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Stephen Rothwell, Ralph Siemsen, Linux Kernel Mailing List,
Linux Next Mailing List
On Fri, Oct 13, 2023 at 9:37 AM Geert Uytterhoeven <geert@linux-m68k•org> wrote:
> > > The only difference is your added SoB?
> >
> > No, I'm not that vain...
>
> I don't see any other difference, though:
The difference is not in the commit, the difference is that the merge
commit is not
there, so it is a commit on top of my pile instead of v6.6-rc.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-11-07 10:48 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-07 10:48 linux-next: duplicate patch in the pinctrl tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-10-12 22:18 Stephen Rothwell
2023-10-12 22:44 ` Linus Walleij
2023-10-13 7:10 ` Geert Uytterhoeven
2023-10-13 7:14 ` Linus Walleij
2023-10-13 7:37 ` Geert Uytterhoeven
2023-10-13 8:58 ` Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox