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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CACRpkdYNRyL-hywayP97PsLvhEk_Dm4HdnYHHo9N50GXMuxWCg@mail.gmail.com>
Date:   Fri, 13 Oct 2023 09:14:40 +0200
From:   Linus Walleij <linus.walleij@...aro.org>
To:     Geert Uytterhoeven <geert@...ux-m68k.org>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Ralph Siemsen <ralph.siemsen@...aro.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: duplicate patch in the pinctrl tree

On Fri, Oct 13, 2023 at 9:10 AM Geert Uytterhoeven <geert@...ux-m68k.org> wrote:
> On Fri, Oct 13, 2023 at 12:44 AM Linus Walleij <linus.walleij@...aro.org> wrote:
> > On Fri, Oct 13, 2023 at 12:18 AM Stephen Rothwell <sfr@...b.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