On Tue, 31 Jul 2012 18:50:22 +0100 Mel Gorman <mgorman@xxxxxxx> 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. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
