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

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

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