[Drbd-dev] linux-next: manual merge of the drbd tree with the block tree

Stephen Rothwell sfr at canb.auug.org.au
Tue May 18 07:20:31 CEST 2010


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 at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.linbit.com/pipermail/drbd-dev/attachments/20100518/ffdc844a/attachment.pgp>


More information about the drbd-dev mailing list