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. Best, Phil > 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. > -- : Dipl-Ing Philipp Reisner : LINBIT | Your Way to High Availability : Tel: +43-1-8178292-50, Fax: +43-1-8178292-82 : http://www.linbit.com DRBD(R) and LINBIT(R) are registered trademarks of LINBIT, Austria. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html