Merge tag 'nfs-for-4.17-2' of git://git.linux-nfs.org/projects/anna/linux-nfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 May 2018 20:56:43 +0000 (13:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 May 2018 20:56:43 +0000 (13:56 -0700)
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

1  2 
MAINTAINERS
include/trace/events/sunrpc.h

diff --cc MAINTAINERS
Simple merge
Simple merge