From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Jul 2019 02:00:37 +0000 (-0700)
Subject: Merge tag 'nfsd-5.2-2' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v5.15~6080
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a8f46b5afe1c0a83c3013a339e6aeccc2f37342d;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'nfsd-5.2-2' of git://linux-nfs.org/~bfields/linux

Pull nfsd fixes from Bruce Fields:
 "Two more quick bugfixes for nfsd: fixing a regression causing mount
  failures on high-memory machines and fixing the DRC over RDMA"

* tag 'nfsd-5.2-2' of git://linux-nfs.org/~bfields/linux:
  nfsd: Fix overflow causing non-working mounts on 1 TB machines
  svcrdma: Ignore source port when computing DRC hash
---

a8f46b5afe1c0a83c3013a339e6aeccc2f37342d