From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 May 2018 20:56:43 +0000 (-0700)
Subject: Merge tag 'nfs-for-4.17-2' of git://git.linux-nfs.org/projects/anna/linux-nfs
X-Git-Tag: v4.17-rc5~10
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a1f45efbb90cce436bde335f8ce78538634951c8;p=users%2Fhch%2Fmisc.git

Merge tag 'nfs-for-4.17-2' of git://git.linux-nfs.org/projects/anna/linux-nfs

Pull NFS client fixes from Anna Schumaker:
 "These patches fix both a possible corruption during NFSoRDMA MR
  recovery, and a sunrpc tracepoint crash.

  Additionally, Trond has a new email address to put in the MAINTAINERS
  file"

* tag 'nfs-for-4.17-2' of git://git.linux-nfs.org/projects/anna/linux-nfs:
  Change Trond's email address in MAINTAINERS
  sunrpc: Fix latency trace point crashes
  xprtrdma: Fix list corruption / DMAR errors during MR recovery
---

a1f45efbb90cce436bde335f8ce78538634951c8