]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
projects / zynq / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c171770 ea08e39)
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)
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


Trivial merge
Linux kenrel for Xilinx Zynq