diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-11 13:56:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-11 13:56:43 -0700 |
| commit | a1f45efbb90cce436bde335f8ce78538634951c8 (patch) | |
| tree | c0ded6cc03a5de256844cb2111af62184e40ab22 /MAINTAINERS | |
| parent | ac42803695e73d5d32b1976aee837d9672382a2a (diff) | |
| parent | 04ac6fdba1afffad664377a324b017e63ac08bd8 (diff) | |
| download | linux-a1f45efbb90cce436bde335f8ce78538634951c8.tar.bz2 | |
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
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index df6e9bb2559a..358e200c04ba 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9873,7 +9873,7 @@ F: include/linux/platform_data/nxp-nci.h F: Documentation/devicetree/bindings/net/nfc/ NFS, SUNRPC, AND LOCKD CLIENTS -M: Trond Myklebust <trond.myklebust@primarydata.com> +M: Trond Myklebust <trond.myklebust@hammerspace.com> M: Anna Schumaker <anna.schumaker@netapp.com> L: linux-nfs@vger.kernel.org W: http://client.linux-nfs.org |