]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'nfs-for-5.2-4' of git://git.linux-nfs.org/projects/anna/linux-nfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Jun 2019 09:02:22 +0000 (17:02 +0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Jun 2019 09:02:22 +0000 (17:02 +0800)
commitc949c30b2640e52b580e1a230e3561d1662195ba
tree6961f9310be5e9595cf9c115b197197cda9fdf36
parent43251dbd6ac278a8bdaaee43ec5e299c1a5dafdd
parent68f461593f76bd5f17e87cdd0bea28f4278c7268
Merge tag 'nfs-for-5.2-4' of git://git.linux-nfs.org/projects/anna/linux-nfs

Pull two more NFS client fixes from Anna Schumaker:
 "These are both stable fixes.

  One to calculate the correct client message length in the case of
  partial transmissions. And the other to set the proper TCP timeout for
  flexfiles"

* tag 'nfs-for-5.2-4' of git://git.linux-nfs.org/projects/anna/linux-nfs:
  NFS/flexfiles: Use the correct TCP timeout for flexfiles I/O
  SUNRPC: Fix up calculation of client message length