From: Ray Lee <ray-lk@madrabbit.org>
To: James Bottomley <James.Bottomley@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
linux-scsi <linux-scsi@vger.kernel.org>,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] final scsi updates for 2.6.34-rc1
Date: Sat, 13 Mar 2010 11:35:59 -0800 [thread overview]
Message-ID: <2c0942db1003131135m1bea386dx4dd7990832cfbfea@mail.gmail.com> (raw)
In-Reply-To: <1268418441.2802.61.camel@mulgrave.site>
On Fri, Mar 12, 2010 at 10:27 AM, James Bottomley wrote:
> I do always have a tree ready in the first days of the merge window. It
> was, in fact, here:
[...]
> The slight problem is that I accumulate updates (like almost everyone
> else) from the few days before the merge window opened up until about
> the middle of the second week. That's what goes into the final pull,
> plus assorted bug fixes that showed up during the window.
You appear to being using git as a sort of baroque CVS. Fixes that
arrive after the beginning of the merge window should be put into a
separate branch other than the one ready for submission. Features that
arrive after the beginning of the merge window should be placed into
yet another branch destined for the next merge window.
next prev parent reply other threads:[~2010-03-13 19:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-10 17:36 James Bottomley
2010-03-12 18:10 ` Linus Torvalds
2010-03-12 18:27 ` James Bottomley
2010-03-12 18:34 ` Linus Torvalds
2010-03-12 18:40 ` Linus Torvalds
2010-03-13 19:35 ` Ray Lee [this message]
2010-03-13 20:16 ` Douglas Gilbert
2010-03-16 17:11 James Bottomley
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=2c0942db1003131135m1bea386dx4dd7990832cfbfea@mail.gmail.com \
--to=ray-lk@madrabbit.org \
--cc=James.Bottomley@suse.de \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--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
all inboxes | Powered by JetHome®