linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, x86@kernel.org
Subject: Re: [GIT pull] irq/urgent for v6.3-rc1
Date: Sun, 05 Mar 2023 21:53:29 +0100	[thread overview]
Message-ID: <87o7p6j4xi.ffs@tglx> (raw)
In-Reply-To: <CAHk-=wg6CNFeiSa5j3BS5z4L+ekLo6-sYZi6YxFVqFVf2viTGw@mail.gmail.com>

On Sun, Mar 05 2023 at 11:50, Linus Torvalds wrote:
> On Sun, Mar 5, 2023 at 11:47 AM Thomas Gleixner <tglx@linutronix.de> wrote:
>>
>> That looks more correct. Let me see what my script zoo managed to get
>> wrong this time.
>
> I think your scripts did the equivalent of generating the diffs for
> all commits separately, and then feeding that to "diffstat".

Kinda. It's the case where the merge in the middle of the commits caused
the thing to create something completely nonsensical. There is even a
comment which says:

 # FIXME: Merge into Linus head and diff there

I put that in after you explained it to me quite some years ago that in
that case 'git merge-base irq/urgent linus' does not work.

Obviously that lazy sod who put the comment there did never bother to
fix it for real. :)

Thanks,

        tglx






  reply	other threads:[~2023-03-05 20:53 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-05  8:54 [GIT pull] irq/urgent for v6.3-rc1 Thomas Gleixner
2023-03-05  8:54 ` [GIT pull] x86/urgent " Thomas Gleixner
2023-03-05 19:37   ` pr-tracker-bot
2023-03-05 19:24 ` [GIT pull] irq/urgent " Linus Torvalds
2023-03-05 19:47   ` Thomas Gleixner
2023-03-05 19:50     ` Linus Torvalds
2023-03-05 20:53       ` Thomas Gleixner [this message]
2023-03-05 19:37 ` pr-tracker-bot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87o7p6j4xi.ffs@tglx \
    --to=tglx@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).