git.kernel.dk Git - linux-2.6-block.git/commit

author	Al Viro <viro@zeniv.linux.org.uk>
	Thu, 1 Nov 2018 22:17:23 +0000 (18:17 -0400)
committer	Al Viro <viro@zeniv.linux.org.uk>
	Thu, 1 Nov 2018 22:17:23 +0000 (18:17 -0400)
commit	78a63f1235deb1ab9c0780b332d9cc18270247e2
tree	ded7d7129a430b36b9a56528b395478aef37d14c	tree \| snapshot
parent	3bf0fb6f33dd545693da5e65f5b1b9b9f0bfc35e	commit \| diff
parent	331bc71cb1751d78f6807ad8e6162b07c67cdd1b	commit \| diff

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

Linux 6.x block layer and io_uring tree(s)