* linux-next: manual merge of the xfs tree with the ext3 tree
@ 2009-09-03 23:55 Stephen Rothwell
2009-09-03 23:56 ` Christoph Hellwig
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2009-09-03 23:55 UTC (permalink / raw)
To: David Chinner, xfs-masters
Cc: linux-next, linux-kernel, Jan Kara, Christoph Hellwig,
Felix Blyakher
[-- Attachment #1: Type: text/plain, Size: 571 bytes --]
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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the xfs tree with the ext3 tree
2009-09-03 23:55 linux-next: manual merge of the xfs tree with the ext3 tree Stephen Rothwell
@ 2009-09-03 23:56 ` Christoph Hellwig
2009-09-04 8:11 ` Jan Kara
0 siblings, 1 reply; 3+ messages in thread
From: Christoph Hellwig @ 2009-09-03 23:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Chinner, xfs-masters, linux-next, linux-kernel, Jan Kara,
Christoph Hellwig, Felix Blyakher
On Fri, Sep 04, 2009 at 09:55:00AM +1000, Stephen Rothwell wrote:
> 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.
Yes, the xfs tree one is the better one, the one in Jan's tree only
does about half of it.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the xfs tree with the ext3 tree
2009-09-03 23:56 ` Christoph Hellwig
@ 2009-09-04 8:11 ` Jan Kara
0 siblings, 0 replies; 3+ messages in thread
From: Jan Kara @ 2009-09-04 8:11 UTC (permalink / raw)
To: Christoph Hellwig
Cc: Stephen Rothwell, David Chinner, xfs-masters, linux-next,
linux-kernel, Jan Kara, Felix Blyakher
On Fri 04-09-09 01:56:52, Christoph Hellwig wrote:
> On Fri, Sep 04, 2009 at 09:55:00AM +1000, Stephen Rothwell wrote:
> > 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.
>
> Yes, the xfs tree one is the better one, the one in Jan's tree only
> does about half of it.
Should I drop the XFS chunk or will you rebase your XFS patch on top of
my patch? The latter seems safer (since my patch series won't compile
without the XFS change)...
Honza
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-09-04 8:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-03 23:55 linux-next: manual merge of the xfs tree with the ext3 tree Stephen Rothwell
2009-09-03 23:56 ` Christoph Hellwig
2009-09-04 8:11 ` Jan Kara
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).