Merge tag 'nfs-for-3.19-1' into nfsd for-3.19 branch
authorJ. Bruce Fields <bfields@redhat.com>
Tue, 9 Dec 2014 16:12:26 +0000 (11:12 -0500)
committerJ. Bruce Fields <bfields@redhat.com>
Tue, 9 Dec 2014 16:12:26 +0000 (11:12 -0500)
commit2941b0e91ba68b1f77140e556307e00616a5bb46
tree01950b6ed12d06ebe4c39d1a2122050a9a570e93
parent818f2f57f20d0e9a9294180f304f34cd4e8f6066
parent388f0c776781fe64ce951701bfe712b2182a31f2
Merge tag 'nfs-for-3.19-1' into nfsd for-3.19 branch

Mainly what I need is 860a0d9e511f "sunrpc: add some tracepoints in
svc_rqst handling functions", which subsequent server rpc patches from
jlayton depend on.  I'm merging this later tag on the assumption that's
more likely to be a tested and stable point.
net/sunrpc/svc.c
net/sunrpc/svc_xprt.c