git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "John W. Linville" <linville@tuxdriver.com>
To: David Miller <davem@davemloft.net>
Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org,
	ron.rindjunsky@intel.com, sfr@canb.auug.org.au,
	tomas.winkler@intel.com, git@vger.kernel.org
Subject: Re: + wireless-fix-iwlwifi-unify-init-driver-flow.patch added to -mm tree
Date: Wed, 14 May 2008 08:34:32 -0400	[thread overview]
Message-ID: <20080514123432.GB3349@tuxdriver.com> (raw)
In-Reply-To: <20080513.221529.20855966.davem@davemloft.net>

On Tue, May 13, 2008 at 10:15:29PM -0700, David Miller wrote:

> I used to play this game, it's a lot of work and it sucks.  One
> "drib" can require fixing up 200 patches down the chain.  And
> I've had this happen to me all the time in the past when I was
> rebasing all the time.

I have to agree with Dave.

Moreover, I used to get regular complaints about the old "regular
rebase" process.  We switched to a "pull and merge" process for 2.6.25,
and in that period nearly all of the process-related complaints
disappeared for me.

To some degree this is a "pick your poison" issue, and for most people
rebasing seems like the deadlier poison.

John
-- 
John W. Linville
linville@tuxdriver.com

  reply	other threads:[~2008-05-14 12:51 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <200805140405.m4E45oBc015343@imap1.linux-foundation.org>
     [not found] ` <20080513.213927.191790810.davem@davemloft.net>
2008-05-14  4:57   ` + wireless-fix-iwlwifi-unify-init-driver-flow.patch added to -mm tree Andrew Morton
2008-05-14  5:15     ` David Miller
2008-05-14 12:34       ` John W. Linville [this message]
2008-05-14 17:50         ` Andrew Morton

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=20080514123432.GB3349@tuxdriver.com \
    --to=linville@tuxdriver.com \
    --cc=akpm@linux-foundation.org \
    --cc=davem@davemloft.net \
    --cc=git@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ron.rindjunsky@intel.com \
    --cc=sfr@canb.auug.org.au \
    --cc=tomas.winkler@intel.com \
    /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).