Re: linux-next: manual merge of the nfsd tree with Linus' tree

2015-07-29 Thread J. Bruce Fields
On Wed, Jul 29, 2015 at 09:35:11PM -0400, Trond Myklebust wrote: > Hi Stephen, > > On Wed, Jul 29, 2015 at 9:23 PM, Stephen Rothwell > wrote: > > Hi all, > > > > Today's linux-next merge of the nfsd tree got a conflict in: > > > > fs/nfs/nfs42proc.c > > > > between commit: > > > > bdcc2cd14e

Re: linux-next: manual merge of the nfsd tree with Linus' tree

2015-07-29 Thread Trond Myklebust
Hi Stephen, On Wed, Jul 29, 2015 at 9:23 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the nfsd tree got a conflict in: > > fs/nfs/nfs42proc.c > > between commit: > > bdcc2cd14e4e ("NFSv4.2: handle NFS-specific llseek errors") > > from Linus' tree and commit: > > 018

linux-next: manual merge of the nfsd tree with Linus' tree

2015-07-29 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the nfsd tree got a conflict in: fs/nfs/nfs42proc.c between commit: bdcc2cd14e4e ("NFSv4.2: handle NFS-specific llseek errors") from Linus' tree and commit: 0183ae17c741 ("NFSv4.2: handle NFS-specific llseek errors") from the nfsd tree. The only dif

linux-next: manual merge of the nfsd tree with Linus' tree

2014-01-28 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the nfsd tree got a conflict in fs/nfsd/nfs4acl.c between commit 4ac7249ea5a0 ("nfsd: use get_acl and ->set_acl") from Linus' tree and commit 3554116d3aae ("nfsd4: simplify xdr encoding of nfsv4 names") from the nfsd tree. I fixed it up (see below) and can carr

linux-next: manual merge of the nfsd tree with Linus' tree

2013-04-02 Thread Stephen Rothwell
Hi, Today's linux-next merge of the nfsd tree got a conflict in fs/nfsd/nfscache.c between commit a517b608fa3d ("nfsd: only unhash DRC entries that are in the hashtable") from Linus' tree and commit 559aa350587e ("nfsd: track memory utilization in the DRC") from the nfsd tree. I fixed it up (see

linux-next: manual merge of the nfsd tree with Linus' tree

2013-02-28 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the nfsd tree got a conflict in fs/nfsd/nfscache.c between commit b67bfe0d42ca ("hlist: drop the node parameter from iterators") from Linus' tree and commit a4a3ec329124 ("nfsd: break out hashtable search into separate function") from the nfsd tree. I fixed it