From: Jens Axboe <jaxboe@fusionio.com>
To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [git pull v3.0-rc1] What branch to base fixes for v3.0-rc1 for block system?
Date: Tue, 31 May 2011 21:25:11 +0200 [thread overview]
Message-ID: <4DE54097.7060000@fusionio.com> (raw)
In-Reply-To: <20110531191039.GA5269@dumpdata.com>
On 2011-05-31 21:10, Konrad Rzeszutek Wilk wrote:
> Hey Jens,
>
> I've got two tiny fixes for the xen-blkback (see below):
>
> git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git for-jens/xen-blkback.fixes
>
> and they are based on for-2.6.40/drivers branch. Is that the way you
> prefer to pull patches from sub-trees? Or should I rebase it on 3.0-rc1?
> Or should send bug-fixes just directly to Linus?
Once I send off the big initial merges which are in the version named
for-2.6.40/xx branches, anything after that should just be based on my
for-linus branch. That's what I use for post-rc1 merges with Linus.
But the only real sticking point is that your branch should not contain
something that I don't have in my for-linus. And you don't right now, so
I just pulled it :-)
--
Jens Axboe
next prev parent reply other threads:[~2011-05-31 19:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-31 19:10 [git pull v3.0-rc1] What branch to base fixes for v3.0-rc1 for block system? Konrad Rzeszutek Wilk
2011-05-31 19:25 ` Jens Axboe [this message]
2011-06-01 15:15 ` Konrad Rzeszutek Wilk
2011-06-02 11:16 ` Jens Axboe
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=4DE54097.7060000@fusionio.com \
--to=jaxboe@fusionio.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.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