[lkml]   [2012]   [Aug]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Subjectlinux-next: manual merge of the osd tree with the nfs tree
    Hi Boaz,

    Today's linux-next merge of the osd tree got a conflict in
    fs/nfs/nfs4proc.c between commit 47fbf7976e0b ("NFSv4.1: Remove a bogus
    BUG_ON() in nfs4_layoutreturn_done") from the nfs tree and commit
    d8e8b68405db ("pnfs: Don't BUG on info received from Server") from the
    osd tree.

    I just used the nfs tree version.
    Stephen Rothwell
    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2012-08-09 02:41    [W:0.019 / U:38.252 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site