Messages in this thread | | | Date | Thu, 30 Jul 2015 11:23:25 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the nfsd tree with Linus' tree |
| |
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.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
| |