From: Jens Axboe <jens.axboe-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
To: Philipp Reisner
<philipp.reisner-63ez5xqkn6DQT0dZR+AlfA@public.gmane.org>
Cc: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>,
Andrew Morton
<akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>,
linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
drbd-dev-cunTk1MwBs8qoQakbn7OcQ@public.gmane.org
Subject: Re: linux-next: manual merge of the drbd tree with the block tree
Date: Tue, 18 May 2010 15:05:46 +0200 [thread overview]
Message-ID: <20100518130545.GZ25951@kernel.dk> (raw)
In-Reply-To: <201005181345.22986.philipp.reisner-63ez5xqkn6DQT0dZR+AlfA@public.gmane.org>
On Tue, May 18 2010, Philipp Reisner wrote:
> Hi Stephen,
>
> FYI:
> I use
> git://git.drbd.org/linux-2.6-drbd.git for-jens
> as path of my patches to Jens.
>
> I switched that tree to Jens'
> git://git.kernel.dk/linux-2.6-block.git for-2.6.35
> and provided the DRBD patches on top of that.
>
> Not that I am not willing to help, I have the feeling that this
> merge conflict has nothing to do with DRBD.
I suspect that the merge will go smoothly with the updated branches when
Stephen runs his scripts tomorrow.
--
Jens Axboe
WARNING: multiple messages have this Message-ID (diff)
From: Jens Axboe <jens.axboe@oracle.com>
To: Philipp Reisner <philipp.reisner@linbit.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Andrew Morton <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
drbd-dev@lists.linbit.com
Subject: Re: [Drbd-dev] linux-next: manual merge of the drbd tree with the block tree
Date: Tue, 18 May 2010 15:05:46 +0200 [thread overview]
Message-ID: <20100518130545.GZ25951@kernel.dk> (raw)
In-Reply-To: <201005181345.22986.philipp.reisner@linbit.com>
On Tue, May 18 2010, Philipp Reisner wrote:
> Hi Stephen,
>
> FYI:
> I use
> git://git.drbd.org/linux-2.6-drbd.git for-jens
> as path of my patches to Jens.
>
> I switched that tree to Jens'
> git://git.kernel.dk/linux-2.6-block.git for-2.6.35
> and provided the DRBD patches on top of that.
>
> Not that I am not willing to help, I have the feeling that this
> merge conflict has nothing to do with DRBD.
I suspect that the merge will go smoothly with the updated branches when
Stephen runs his scripts tomorrow.
--
Jens Axboe
WARNING: multiple messages have this Message-ID (diff)
From: Jens Axboe <jens.axboe@oracle.com>
To: Philipp Reisner <philipp.reisner@linbit.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
drbd-dev@lists.linbit.com, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: linux-next: manual merge of the drbd tree with the block tree
Date: Tue, 18 May 2010 15:05:46 +0200 [thread overview]
Message-ID: <20100518130545.GZ25951@kernel.dk> (raw)
In-Reply-To: <201005181345.22986.philipp.reisner@linbit.com>
On Tue, May 18 2010, Philipp Reisner wrote:
> Hi Stephen,
>
> FYI:
> I use
> git://git.drbd.org/linux-2.6-drbd.git for-jens
> as path of my patches to Jens.
>
> I switched that tree to Jens'
> git://git.kernel.dk/linux-2.6-block.git for-2.6.35
> and provided the DRBD patches on top of that.
>
> Not that I am not willing to help, I have the feeling that this
> merge conflict has nothing to do with DRBD.
I suspect that the merge will go smoothly with the updated branches when
Stephen runs his scripts tomorrow.
--
Jens Axboe
next prev parent reply other threads:[~2010-05-18 13:05 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-18 5:20 linux-next: manual merge of the drbd tree with the block tree Stephen Rothwell
2010-05-18 5:20 ` Stephen Rothwell
2010-05-18 5:20 ` [Drbd-dev] " Stephen Rothwell
[not found] ` <20100518152031.9a244971.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2010-05-18 11:45 ` Philipp Reisner
2010-05-18 11:45 ` Philipp Reisner
2010-05-18 11:45 ` [Drbd-dev] " Philipp Reisner
[not found] ` <201005181345.22986.philipp.reisner-63ez5xqkn6DQT0dZR+AlfA@public.gmane.org>
2010-05-18 13:05 ` Jens Axboe [this message]
2010-05-18 13:05 ` Jens Axboe
2010-05-18 13:05 ` [Drbd-dev] " Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2010-06-02 4:03 Stephen Rothwell
2010-06-02 4:03 ` Stephen Rothwell
2010-06-02 6:19 ` 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=20100518130545.GZ25951@kernel.dk \
--to=jens.axboe-qhclzuegtsvqt0dzr+alfa@public.gmane.org \
--cc=akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org \
--cc=drbd-dev-cunTk1MwBs8qoQakbn7OcQ@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=philipp.reisner-63ez5xqkn6DQT0dZR+AlfA@public.gmane.org \
--cc=sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.