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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 2 Jun 2010 14:03:22 +1000

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