From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Sep 2017 03:04:32 +0000 (-0700)
Subject: Merge tag 'nfs-for-4.14-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: v4.14~315
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6ed0529fef09f50ef41d396cb55c5519e4936b16;p=mirror_ubuntu-bionic-kernel.git

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
---

6ed0529fef09f50ef41d396cb55c5519e4936b16