From: Jens Axboe <jaxboe@fusionio.com>
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,
Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Subject: Re: linux-next: manual merge of the drbd tree with the block tree
Date: Wed, 2 Jun 2010 08:19:07 +0200 [thread overview]
Message-ID: <20100602061907.GI3564@kernel.dk> (raw)
In-Reply-To: <20100602140322.7e374a2e.sfr@canb.auug.org.au>
On Wed, Jun 02 2010, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drbd tree got a conflict in
> fs/fs-writeback.c between commit f17625b318d9b151e7bd41e31223e9d89b2aaa77
> ("Revert "writeback: ensure that WB_SYNC_NONE writeback with sb pinned is
> sync"") from the block tree and commits
> 5c92877730b509fefc445bbba6b3bc441c2c272a ("writeback: fix early free of
> work struct") and dff38fd3d1d0914ac0715445bbe21fbce9abed15 ("writeback:
> fix non-integrity write-back") from the drbd tree.
>
> I suspect this is caused because the drbd tree id based on a different
> version of the block tree to what is in the block tree for-next branch.
> I just used the version of this file from the block tree.
Yeah, I had to yank a few patches since they didn't quite work out in
Christophs testing. The for-next version in the block tree has it all,
so that approach works.
--
Jens Axboe
WARNING: multiple messages have this Message-ID (diff)
From: Jens Axboe <jaxboe@fusionio.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-kernel@vger.kernel.org,
Artem Bityutskiy <Artem.Bityutskiy@nokia.com>,
linux-next@vger.kernel.org,
Philipp Reisner <philipp.reisner@linbit.com>,
drbd-dev@lists.linbit.com
Subject: Re: [Drbd-dev] linux-next: manual merge of the drbd tree with the block tree
Date: Wed, 2 Jun 2010 08:19:07 +0200 [thread overview]
Message-ID: <20100602061907.GI3564@kernel.dk> (raw)
In-Reply-To: <20100602140322.7e374a2e.sfr@canb.auug.org.au>
On Wed, Jun 02 2010, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drbd tree got a conflict in
> fs/fs-writeback.c between commit f17625b318d9b151e7bd41e31223e9d89b2aaa77
> ("Revert "writeback: ensure that WB_SYNC_NONE writeback with sb pinned is
> sync"") from the block tree and commits
> 5c92877730b509fefc445bbba6b3bc441c2c272a ("writeback: fix early free of
> work struct") and dff38fd3d1d0914ac0715445bbe21fbce9abed15 ("writeback:
> fix non-integrity write-back") from the drbd tree.
>
> I suspect this is caused because the drbd tree id based on a different
> version of the block tree to what is in the block tree for-next branch.
> I just used the version of this file from the block tree.
Yeah, I had to yank a few patches since they didn't quite work out in
Christophs testing. The for-next version in the block tree has it all,
so that approach works.
--
Jens Axboe
next prev parent reply other threads:[~2010-06-02 6:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-02 4:03 linux-next: manual merge of the drbd tree with the block tree Stephen Rothwell
2010-06-02 4:03 ` Stephen Rothwell
2010-06-02 4:03 ` [Drbd-dev] " Stephen Rothwell
2010-06-02 6:19 ` Jens Axboe [this message]
2010-06-02 6:19 ` Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2010-05-18 5:20 Stephen Rothwell
2010-05-18 5:20 ` 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
[not found] ` <201005181345.22986.philipp.reisner-63ez5xqkn6DQT0dZR+AlfA@public.gmane.org>
2010-05-18 13:05 ` Jens Axboe
2010-05-18 13:05 ` 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=20100602061907.GI3564@kernel.dk \
--to=jaxboe@fusionio.com \
--cc=Artem.Bityutskiy@nokia.com \
--cc=drbd-dev@linbit.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=philipp.reisner@linbit.com \
--cc=sfr@canb.auug.org.au \
/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.