Subject: Re: linux-next: manual merge of the akpm tree with the nfs tree

From: Andrew Morton <[email-masked]>
Date: Tue, 31 Jul 2012 11:44:26 -0700

On Tue, 31 Jul 2012 18:50:22 +0100
Mel Gorman <[email-masked]> 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.