public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Mike Travis <travis@sgi.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: Yinghai Lu <yinghai@kernel.org>, "H. Peter Anvin" <hpa@zytor.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] x86: arch_probe_nr_irqs
Date: Thu, 15 Jan 2009 12:53:31 -0800	[thread overview]
Message-ID: <496FA24B.5050306@sgi.com> (raw)
In-Reply-To: <20090115094938.GB5833@elte.hu>

Ingo Molnar wrote:
> * Mike Travis <travis@sgi.com> wrote:
> 
>> Very cool, thanks!!
>>
>> The one thing I always get hung up on is what args to use with the git 
>> rebase -i command.  Say I want to edit 4a046d1 (which I do ;-), I see it 
>> in my repo with git-log (3rd one down):
> 
> You shouldnt edit 4a046d1 anymore as i already pulled it - you can queue 
> up a fix commit. (Or we can decide to drop the whole tree and re-pull 
> yours - but that is an emergency path not to be taken lightly.)
> 

... rebase description deleted (thanks!)

> 
> Ok?

Yes.

> 
> ( Or if you are sure you can fix the bug via a single pass, you can change 
>   the 'pick' line to 'edit' and do the editing and 'git commit --amend' 
>   right during the rebase. If it's still not perfect it needs another 
>   rebase though and it's easy to mess up rebases. )
> 
> 	Ingo

This all started because you wanted a more descriptive changelog for Yinghai's
probe_nr_irqs() patch.  I was attempting to do this, and is why I sent the
full text to you, in case I couldn't do it (as you explained above).

I'm guessing this subject is now closed?

Thanks,
Mike

  reply	other threads:[~2009-01-15 21:07 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-12  5:42 [PATCH] x86: include apicnum.h in acpidef.h Yinghai Lu
2009-01-12  9:19 ` Ingo Molnar
2009-01-12  9:26   ` Ingo Molnar
2009-01-12  9:27     ` Ingo Molnar
2009-01-12 19:53     ` [PATCH] x86: arch_probe_nr_irqs Yinghai Lu
2009-01-12 23:07       ` Mike Travis
2009-01-14 11:19         ` Ingo Molnar
2009-01-14 19:50           ` Mike Travis
2009-01-14 20:11             ` Ingo Molnar
2009-01-14 21:26               ` Mike Travis
2009-01-15  9:49                 ` Ingo Molnar
2009-01-15 20:53                   ` Mike Travis [this message]
2009-01-15 21:02                     ` Ingo Molnar
2009-01-12 19:09 ` [PATCH] x86: include apicnum.h in acpidef.h Mike Travis

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=496FA24B.5050306@sgi.com \
    --to=travis@sgi.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.de \
    --cc=yinghai@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