Merge tag 'nfsd-5.2-2' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jul 2019 02:00:37 +0000 (19:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jul 2019 02:00:37 +0000 (19:00 -0700)
commita8f46b5afe1c0a83c3013a339e6aeccc2f37342d
tree83400e22faa4d383e7e0b385940790f796f0793e
parent3f9c4dc63309286a6513a86aac35ffc445cb9d1a
parent3b2d4dcf71c4a91b420f835e52ddea8192300a3b
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