commit 6ed0529fef09f50ef41d396cb55c5519e4936b16
author Linus Torvalds <torvalds@linux-foundation.org> Thu Sep 14 20:04:32 2017 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Sep 14 20:04:32 2017 -0700
tree 09d83956d0c386fc62440243c903ca889f34ab2c
parent 9e0ce554b039e3df288d83189ecf226c16da04af
parent bf4b49059718b2217339eb15c60f8753d5b0da99

Merge tag 'nfs-for-4.14-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull more NFS client updates from Trond Myklebust:
 "Hightlights include:

  Bugfixes:
   - Various changes relating to reporting IO errors.
   - pnfs: Use the standard I/O stateid when calling LAYOUTGET

  Features:
   - Add static NFS I/O tracepoints for debugging"

* tag 'nfs-for-4.14-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFS: various changes relating to reporting IO errors.
  NFS: Add static NFS I/O tracepoints
  pNFS: Use the standard I/O stateid when calling LAYOUTGET