[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAMuHMdWVq+jaEV=7BMB=+fO0EZyGpjBcm=bu3Mm-QvRqm1NNZQ@mail.gmail.com>
Date: Mon, 13 Feb 2023 11:04:34 +0100
From: Geert Uytterhoeven <geert@...ux-m68k.org>
To: Linus Walleij <linus.walleij@...aro.org>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
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-intel-fixes tree
Hi Linus,
On Mon, Feb 13, 2023 at 10:57 AM Linus Walleij <linus.walleij@...aro.org> wrote:
> On Sun, Feb 12, 2023 at 10:06 PM 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):
> >
> > a13bbd841bf8 ("pinctrl: intel: Restore the pins that used to be in Direct IRQ mode")
> >
> > This is commit
> >
> > a8520be3ffef ("pinctrl: intel: Restore the pins that used to be in Direct IRQ mode")
> >
> > in Linus' tree.
>
> This is really weird because my only copy of that patch was on the fixes branch
> and that is what I sent to Torvalds.
>
> When I check my tag pinctrl-v6.2-3 it's like this:
>
> commit a8520be3ffef3d25b53bf171a7ebe17ee0154175 (HEAD, tag: pinctrl-v6.2-3)
> Author: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
> Date: Mon Feb 6 16:15:59 2023 +0200
>
> pinctrl: intel: Restore the pins that used to be in Direct IRQ mode
>
> So that is what went to Torvalds' tree. It's also the only thing I
> ever published to
> the for-next branch, as it turns out after some git reflog in my working tree:
>
> a8520be3ffef (HEAD, tag: pinctrl-v6.2-3) HEAD@...}: reset: moving to fixes
> a8520be3ffef (HEAD, tag: pinctrl-v6.2-3) HEAD@...}: reset: moving to fixes
> a8520be3ffef (HEAD, tag: pinctrl-v6.2-3) HEAD@...}: reset: moving to fixes
> a8520be3ffef (HEAD, tag: pinctrl-v6.2-3) HEAD@...}: am: pinctrl:
> intel: Restore the pins that used to be in Direct IRQ mode
>
> So what is this a13bbd841bf8 patch coming from?
"git show --pretty=fuller" says:
Commit: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
CommitDate: Mon Feb 6 17:03:06 2023 +0200
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@...ux-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
Powered by blists - more mailing lists