Messages in this thread |  | | Date | Wed, 29 Jul 2015 21:35:11 -0400 | | Subject | Re: linux-next: manual merge of the nfsd tree with Linus' tree | | From | Trond Myklebust <> |
| |
Hi Stephen,
On Wed, Jul 29, 2015 at 9:23 PM, Stephen Rothwell <sfr@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
|  |