lkml.org 
[lkml]   [2012]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: manual merge of the akpm tree with the nfs tree
    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.



    \
     
     \ /
      Last update: 2012-07-31 21:21    [W:0.021 / U:29.736 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site