From: Jens Axboe <axboe@kernel•dk>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Philipp Reisner <philipp.reisner@linbit•com>,
drbd-dev@linbit•com, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org
Subject: Re: linux-next: manual merge of the drbd tree with the block trees
Date: Thu, 10 Jun 2010 08:01:35 +0200 [thread overview]
Message-ID: <4C107FBF.9050209@kernel.dk> (raw)
In-Reply-To: <20100610135203.4649453a.sfr@canb.auug.org.au>
On 2010-06-10 05:52, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drbd tree got a conflicts in
> fs/fs-writeback.c against the block tree.
>
> It looks like the block tree has moved under the drbd tree again. I used
> the version of this file from the block tree for today.
I'm starting to think that it would be a little easier if you did not
pull the drbd tree, I really should be pulling that into my -next branch
instead.
--
Jens Axboe
next prev parent reply other threads:[~2010-06-10 6:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-10 3:52 linux-next: manual merge of the drbd tree with the block trees Stephen Rothwell
2010-06-10 6:01 ` Jens Axboe [this message]
[not found] ` <4C107FBF.9050209-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org>
2010-06-14 1:26 ` Stephen Rothwell
2010-06-14 9:08 ` Jens Axboe
[not found] ` <4C15F18C.3050905-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org>
2010-06-14 9:43 ` Philipp Reisner
2010-06-14 9:45 ` Jens Axboe
[not found] ` <4C15FA1C.1080901-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org>
2010-06-14 10:08 ` Philipp Reisner
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=4C107FBF.9050209@kernel.dk \
--to=axboe@kernel$(echo .)dk \
--cc=drbd-dev@linbit$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=philipp.reisner@linbit$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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