Merge tag 'nfsd-4.9-2' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Nov 2016 00:32:21 +0000 (16:32 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Nov 2016 00:32:21 +0000 (16:32 -0800)
commitaad931a30fd88c5319868c6891396d04ad6bfb3e
treea8d970987efceae823ad12f44ee2128d7cd74af2
parentc1717701be2f0639e5f817385a524131dbd3ff38
parentea08e39230e898844d9de5b60cdbb30067cebfe7
Merge tag 'nfsd-4.9-2' of git://linux-nfs.org/~bfields/linux

Pull nfsd bugfix from Bruce Fields:
 "Just one fix for an NFS/RDMA crash"

* tag 'nfsd-4.9-2' of git://linux-nfs.org/~bfields/linux:
  sunrpc: svc_age_temp_xprts_now should not call setsockopt non-tcp transports