On Tue, 2012-07-31 at 11:44 -0700, Andrew Morton wrote: > On Tue, 31 Jul 2012 18:50:22 +0100 > Mel Gorman <mgor...@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.mykleb...@netapp.com www.netapp.com
