lkml.org 
[lkml]   [2009]   [Aug]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: linux-next: manual merge of the nfsd tree with the nfs tree
    From
    Date
    On Mon, 2009-08-10 at 12:05 -0400, J. Bruce Fields wrote:
    > On Mon, Aug 10, 2009 at 10:58:51AM +1000, Stephen Rothwell wrote:
    > > Hi Bruce,
    > >
    > > Today's linux-next merge of the nfsd tree got a conflict in
    > > net/sunrpc/cache.c between commit
    > > 173912a6add00f4715774dcecf9ee53274c5924c ("SUNRPC: Move procfs-specific
    > > stuff out of the generic sunrpc cache code") from the nfs tree and commit
    > > f866a8194f7cbabb9135b98b9ac7d26237b88367 ("sunrpc/cache: rename
    > > queue_loose to cache_dequeue") from the nfsd tree.
    >
    > OK, thanks.
    >
    > Looks like there may be some less trivial conflicts now, though. Trond,
    > maybe you could rebase the cache stuff against my latest for-2.6.32?

    I've merged your for-2.6.32 into a dedicated sunrpc_cache-for_next topic
    branch and pushed that out as part of the NFS client linux-next.

    --
    Trond Myklebust
    Linux NFS client maintainer

    NetApp
    Trond.Myklebust@netapp.com
    www.netapp.com


    \
     
     \ /
      Last update: 2009-08-10 20:13    [W:0.023 / U:0.236 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site