Subject: linux-next: manual merge of the xfs tree with the ext3 tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 4 Sep 2009 09:55:00 +1000

Hi all,

Today's linux-next merge of the xfs tree got a conflict in
fs/xfs/linux-2.6/xfs_lrw.c between commit
218604a0bf712976171798b1dd5c44d26d6d0ea4 ("xfs: Convert sync_page_range()
to simple filemap_write_and_wait_range()") from the ext3 tree and commit
13e6d5cdde0e785aa943810f08b801cadd0935df ("xfs: merge fsync and O_SYNC
handling") from the xfs tree.

They both do the same thing (to this bit of code) ... I used the version
from the xfs tree.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/