From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <jaxboe@fusionio•com>
Cc: Christoph Hellwig <hch@infradead•org>,
Philipp Reisner <philipp.reisner@linbit•com>,
drbd-dev@linbit•com, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org, Julia Lawall <julia@diku•dk>,
Al Viro <viro@zeniv•linux.org.uk>
Subject: Re: linux-next: manual merge of the drbd tree with Linus' tree
Date: Tue, 1 Jun 2010 20:49:42 +1000 [thread overview]
Message-ID: <20100601204942.134965e5.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20100601104515.GM3564@kernel.dk>
[-- Attachment #1: Type: text/plain, Size: 806 bytes --]
HI Jens,
On Tue, 1 Jun 2010 12:45:15 +0200 Jens Axboe <jaxboe@fusionio•com> wrote:
>
> So the pipe patches were the same, the problem was that a fix for a
> missing pipe_unlock() had gone into mainline and for-linus/for-next
> weren't synced up to that. I'm guessing you pull drbd before for-next
> and that is why it showed up there.
Actually, I merge the drbd tree after the block tree and this fell to the
drbd tree only because your for-next branch had not been updated (and I
don't merge your for-linus branch).
> BTW, I would recommend moving for-next from the block tree up before any
> potential other trees being based off it if that is the case.
That is already true.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2010-06-01 10:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-01 4:13 linux-next: manual merge of the drbd tree with Linus' tree Stephen Rothwell
2010-06-01 8:18 ` Christoph Hellwig
[not found] ` <20100601081823.GA29991-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2010-06-01 8:22 ` Stephen Rothwell
2010-06-01 8:31 ` Jens Axboe
2010-06-01 8:42 ` Stephen Rothwell
2010-06-01 8:53 ` Jens Axboe
2010-06-01 10:35 ` Stephen Rothwell
2010-06-01 10:45 ` Jens Axboe
2010-06-01 10:49 ` Stephen Rothwell [this message]
2010-06-01 10:50 ` Jens Axboe
2010-06-01 8:22 ` Jens Axboe
[not found] ` <20100601082246.GA3564-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org>
2010-06-01 8:32 ` Christoph Hellwig
2010-06-01 8:36 ` 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=20100601204942.134965e5.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=drbd-dev@linbit$(echo .)com \
--cc=hch@infradead$(echo .)org \
--cc=jaxboe@fusionio$(echo .)com \
--cc=julia@diku$(echo .)dk \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=philipp.reisner@linbit$(echo .)com \
--cc=viro@zeniv$(echo .)linux.org.uk \
/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