From: Andrew Morton <akpm@linux-foundation.org>
To: Theodore Ts'o <tytso@mit.edu>
Cc: Glauber Costa <glommer@gmail.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Zheng Liu <wenqing.lz@taobao.com>,
Dave Chinner <dchinner@redhat.com>,
Glauber Costa <glommer@openvz.org>
Subject: Re: linux-next: manual merge of the akpm tree with the ext4 tree
Date: Wed, 19 Jun 2013 10:06:35 -0700 [thread overview]
Message-ID: <20130619100635.72acbd05.akpm@linux-foundation.org> (raw)
In-Reply-To: <20130619142031.GC24194@thunk.org>
On Wed, 19 Jun 2013 10:20:31 -0400 "Theodore Ts'o" <tytso@mit.edu> wrote:
> Is there some way we can avoid this conflict during the next merge
> window? Given that this is an API change, it may not be possible.
> Failing that, what's the best merge strategy; should we try to make
> sure your change goes first, and then I can defer the ext4 pull
> request until a little bit later in the merge window?
Merge the ext4 change early, please. The core shrinker changes aren't
100% certain at this time - first they need to stop oopsing ;)
next prev parent reply other threads:[~2013-06-19 17:06 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-19 7:27 linux-next: manual merge of the akpm tree with the ext4 tree Stephen Rothwell
2013-06-19 7:44 ` Glauber Costa
2013-06-19 7:45 ` Stephen Rothwell
2013-06-19 14:20 ` Theodore Ts'o
2013-06-19 17:06 ` Andrew Morton [this message]
2013-06-19 18:59 ` Theodore Ts'o
2013-06-19 21:08 ` Glauber Costa
2013-06-19 7:48 ` Zheng Liu
-- strict thread matches above, loose matches on Subject: below --
2013-08-07 5:19 Stephen Rothwell
2013-08-09 22:21 ` Kees Cook
2013-08-09 22:34 ` Andrew Morton
2013-08-07 5:16 Stephen Rothwell
2013-07-16 4:56 Stephen Rothwell
2013-07-16 4:53 Stephen Rothwell
2012-07-16 6:52 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=20130619100635.72acbd05.akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=dchinner@redhat.com \
--cc=glommer@gmail.com \
--cc=glommer@openvz.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tytso@mit.edu \
--cc=wenqing.lz@taobao.com \
/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).