From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 29 Jun 2019 09:02:22 +0000 (+0800)
Subject: Merge tag 'nfs-for-5.2-4' of git://git.linux-nfs.org/projects/anna/linux-nfs
X-Git-Tag: v5.2-rc7~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c949c30b2640e52b580e1a230e3561d1662195ba;p=thirdparty%2Fkernel%2Flinux.git

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
---

c949c30b2640e52b580e1a230e3561d1662195ba