[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20090904095500.04205407.sfr@canb.auug.org.au>
Date: Fri, 4 Sep 2009 09:55:00 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: David Chinner <david@...morbit.com>, xfs-masters@....sgi.com
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Jan Kara <jack@...e.cz>, Christoph Hellwig <hch@....de>,
Felix Blyakher <felixb@....com>
Subject: linux-next: manual merge of the xfs tree with the ext3 tree
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 sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists