From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Philipp Reisner <philipp.reisner@linbit•com>, drbd-dev@linbit•com
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jens Axboe <jens.axboe@oracle•com>,
Andrew Morton <akpm@linux-foundation•org>
Subject: linux-next: manual merge of the drbd tree with the block tree
Date: Tue, 18 May 2010 15:20:31 +1000 [thread overview]
Message-ID: <20100518152031.9a244971.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 726 bytes --]
Hi all,
Today's linux-next merge of the drbd tree got a conflict in
mm/page-writeback.c between commit
42bd225c0ba7c95af39293d39a950c48e7e5cb23 (""laptop-mode: Make flushes
per-device" fix") from the block tree and commit
e913fc825dc685a444cb4c1d0f9d32f372f59861 ("writeback: fix WB_SYNC_NONE
writeback from umount") from the drbd tree (via its merge of the block
tree).
I used the next-20100517 version of the block tree today (because the
above conflict was not resolved correctly in the block tree and caused a
build failure), so I will also use the next-20100517 version of the drbd
tree for today.
--
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 reply other threads:[~2010-05-18 5:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-18 5:20 Stephen Rothwell [this message]
[not found] ` <20100518152031.9a244971.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2010-05-18 11:45 ` linux-next: manual merge of the drbd tree with the block tree Philipp Reisner
[not found] ` <201005181345.22986.philipp.reisner-63ez5xqkn6DQT0dZR+AlfA@public.gmane.org>
2010-05-18 13:05 ` Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
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=20100518152031.9a244971.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=drbd-dev@linbit$(echo .)com \
--cc=jens.axboe@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=philipp.reisner@linbit$(echo .)com \
/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