From: "Theodore Ts'o" <tytso@mit.edu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@ZenIV.linux.org.uk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@lst.de>, Jan Kara <jack@suse.cz>
Subject: Re: linux-next: manual merge of the vfs tree with the ext4 tree
Date: Mon, 16 May 2016 23:16:31 -0400 [thread overview]
Message-ID: <20160517031631.GT7799@thunk.org> (raw)
In-Reply-To: <20160517102355.4be4af45@canb.auug.org.au>
On Tue, May 17, 2016 at 10:23:55AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the vfs tree got conflicts in:
>
> fs/ext4/ext4.h
> fs/ext4/indirect.c
> fs/ext4/inode.c
>
> between commit:
>
> 914f82a32d02 ("ext4: refactor direct IO code")
>
> from the ext4 tree and commit:
>
> c8b8e32d700f ("direct-io: eliminate the offset argument to ->direct_IO")
>
> from the vfs tree.
>
> I fixed it up (hopefully - see below) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.
Thanks for the heads up. My merge resolution was backwards from yours
(because I merged the ext4 tree into vfs tree while you apparently did
the reverse), and this resolution was complex enough that I'm waiting
for you to publish next-20160517 to make sure you came up with the
same final result of fs/ext4/inode.c (minus the f2fs's ext4 crypto
merge, which I think Jaeguk is going to be dropping from his tree, but
I don't know if that will have happened by next-20160517).
I'm kicking off a set of tests to make sure there aren't problems with
the resulting merge going beyond the purely syntactic merge
resolution.
Cheers,
- Ted
next prev parent reply other threads:[~2016-05-17 3:16 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-17 0:23 linux-next: manual merge of the vfs tree with the ext4 tree Stephen Rothwell
2016-05-17 3:16 ` Theodore Ts'o [this message]
2016-05-18 14:25 ` Arnd Bergmann
2016-05-19 1:26 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2020-01-27 22:51 Stephen Rothwell
2015-06-09 2:47 Stephen Rothwell
2015-05-11 0:49 Stephen Rothwell
2015-04-15 1:35 Stephen Rothwell
2015-04-14 1:30 Stephen Rothwell
2015-04-14 1:48 ` Al Viro
2015-04-14 17:00 ` Theodore Ts'o
2015-04-14 17:17 ` Al Viro
2015-04-14 21:02 ` Theodore Ts'o
2015-04-14 21:14 ` Al Viro
2015-04-13 1:48 Stephen Rothwell
2015-04-13 1:43 Stephen Rothwell
2015-04-07 4:00 Stephen Rothwell
2015-04-07 7:02 ` Christoph Hellwig
2015-04-07 7:36 ` Stephen Rothwell
2015-04-08 3:26 ` Theodore Ts'o
2015-04-14 16:18 ` Christoph Hellwig
2015-04-14 20:43 ` Theodore Ts'o
2014-05-27 2:07 Stephen Rothwell
2014-04-22 1:13 Stephen Rothwell
2012-01-06 2:54 Stephen Rothwell
2012-01-06 20:46 ` Djalal Harouni
2011-12-21 0:18 Stephen Rothwell
2011-12-21 0:43 ` Stephen Rothwell
2011-07-18 3:36 Stephen Rothwell
2011-07-25 2:38 ` Stephen Rothwell
2009-05-19 4:23 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160517031631.GT7799@thunk.org \
--to=tytso@mit.edu \
--cc=hch@lst.de \
--cc=jack@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).