Subject: linux-next: manual merge of the drbd tree with the block tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 18 May 2010 15:20:31 +1000

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                    [email-masked]
http://www.canb.auug.org.au/~sfr/