From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 1 Nov 2018 22:17:23 +0000 (-0400)
Subject: Merge tag 'nfs-for-4.20-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: v4.20-rc1~14^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=78a63f1235deb1ab9c0780b332d9cc18270247e2;p=uclinux-h8%2Flinux.git

Merge tag 'nfs-for-4.20-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

backmerge to do fixup of iov_iter_kvec() conflict
---

78a63f1235deb1ab9c0780b332d9cc18270247e2