From: "Myklebust, Trond" <Trond.Myklebust@netapp•com>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: Mel Gorman <mgorman@suse•de>,
Stephen Rothwell <sfr@canb•auug.org.au>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>,
Jeff Layton <jlayton@redhat•com>
Subject: Re: linux-next: manual merge of the akpm tree with the nfs tree
Date: Tue, 31 Jul 2012 19:00:35 +0000 [thread overview]
Message-ID: <1343761233.5528.27.camel@lade.trondhjem.org> (raw)
In-Reply-To: <20120731114426.029644e0.akpm@linux-foundation.org>
On Tue, 2012-07-31 at 11:44 -0700, Andrew Morton wrote:
> On Tue, 31 Jul 2012 18:50:22 +0100
> Mel Gorman <mgorman@suse•de> wrote:
>
> > Stephen Rothwell reported a merge conflict between a MM patch "nfs:
> > enable swap on NFS" and an NFS patch "nfs: skip commit in
> > releasepage if we're freeing memory for fs-related reasons".
>
> grumble. This happened becase new stuff was added to -next right in
> the middle of the merge window. Please don't dothat.
>
Normally, I would have added it when Jeff asked me to, but I've been on
vacation for 2 weeks, and this is a bugfix that needs to go into
stable...
Trond
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust@netapp•com
www.netapp.com
prev parent reply other threads:[~2012-07-31 19:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-31 4:24 linux-next: manual merge of the akpm tree with the nfs tree Stephen Rothwell
2012-07-31 10:33 ` Mel Gorman
2012-07-31 14:37 ` Myklebust, Trond
2012-07-31 15:19 ` Mel Gorman
2012-07-31 15:35 ` Myklebust, Trond
2012-07-31 17:50 ` Mel Gorman
2012-07-31 18:44 ` Andrew Morton
2012-07-31 19:00 ` Myklebust, Trond [this message]
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=1343761233.5528.27.camel@lade.trondhjem.org \
--to=trond.myklebust@netapp$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=jlayton@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mgorman@suse$(echo .)de \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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