Hi Stephen, On Wed, Jul 29, 2015 at 9:23 PM, Stephen Rothwell <s...@canb.auug.org.au> 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: > > 0183ae17c741 ("NFSv4.2: handle NFS-specific llseek errors") > > from the nfsd tree. > > The only difference here is that _nfs42_proc_llseek is static in the > former, so I used that. >
Yes, I snuck that declaration into the patch since it was obvious that we would never want to export _nfs42_proc_llseek(), and because "sparse" complained. Apologies if that caused a conflict... Cheers Trond -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/