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
Subject: Re: linux-next: manual merge of the vfs tree with Linus' and te ext4 trees
Date: Mon, 21 Apr 2014 21:19:19 -0400 [thread overview]
Message-ID: <20140422011918.GA9441@thunk.org> (raw)
In-Reply-To: <20140422110459.ab3af554dd61297c61a568c2@canb.auug.org.au>
On Tue, Apr 22, 2014 at 11:04:59AM +1000, Stephen Rothwell wrote:
>
> Today's linux-next merge of the vfs tree got a conflict in
> fs/ext4/extents.c between rebased versions of commits from Linus' and the
> ext4 trees and the same commits from the vfs tree.
>
> I fixed it up (I just used the version from Linus' and the ext4 trees)
> and can carry the fix as necessary (no action is required).
>
> Al, this is why I asked you about checking with Ted about his tree being
> rebased after you merged it into yours ...
Sorry, Al, I hadn't been aware you wanted to carrying some of these
changes. I had mentioned that I was planning on carrying them in the
ext4 tree and including them for 3.15 because some of them were fixing
bugs that had been introduced in the merge window. Since no one
objected, I thought everyone was on the same page about that plan.
- Ted
next prev parent reply other threads:[~2014-04-22 1:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-22 1:04 linux-next: manual merge of the vfs tree with Linus' and te ext4 trees Stephen Rothwell
2014-04-22 1:19 ` Theodore Ts'o [this message]
2014-04-22 1:34 ` Al Viro
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=20140422011918.GA9441@thunk.org \
--to=tytso@mit.edu \
--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).