public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Tejun Heo <tj@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linux Kernel <linux-kernel@vger.kernel.org>,
	David Miller <davem@davemloft.net>, Meelis Roos <mroos@linux.ee>
Subject: Re: [GIT PULL] percpu fixes for 2.6.31-rc8
Date: Sun, 06 Sep 2009 06:44:48 +0900	[thread overview]
Message-ID: <4AA2DBD0.1000106@kernel.org> (raw)
In-Reply-To: <alpine.LFD.2.01.0909051422130.3414@localhost.localdomain>

Hello, Linus.

Linus Torvalds wrote:
> On Tue, 1 Sep 2009, Tejun Heo wrote:
>> Ummm... one question.  The above tree is on top of the previous
>> for-linus fixes tree.  It pulls in to the current #master alright but
>> it would still be a merge instead of a fast-forward.  Would it be
>> better to prep fixes tree on top of the current #master so that it
>> results in fast-forward?  If that's the case, please let me know or
>> just cherry pick the top commit.
> 
> No, I actually prefer people to avoid rebasing unless they have some real 
> reason for it. My pulls almost always end up being merges anyway, since I 
> pull from several people, so even if you were to have rebased, it would 
> _not_ have been a fast-forward for me, since I'd in the meantime have 
> pulled from others anyway.

Alright, thanks for the explanation.  Will do as advised.

-- 
tejun

      reply	other threads:[~2009-09-05 21:44 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-09-01 12:51 [GIT PULL] percpu fixes for 2.6.31-rc8 Tejun Heo
2009-09-01 12:56 ` Tejun Heo
2009-09-05 21:23   ` Linus Torvalds
2009-09-05 21:44     ` Tejun Heo [this message]

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=4AA2DBD0.1000106@kernel.org \
    --to=tj@kernel.org \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mroos@linux.ee \
    --cc=torvalds@linux-foundation.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