projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3bf0fb6 331bc71)
Merge tag 'nfs-for-4.20-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 1 Nov 2018 22:17:23 +0000 (18:17 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 1 Nov 2018 22:17:23 +0000 (18:17 -0400)
backmerge to do fixup of iov_iter_kvec() conflict

1  2 
net/sunrpc/svcsock.c patch | diff1 | diff2 | blob | history

diff --cc net/sunrpc/svcsock.c
Simple merge
Linux 6.x block layer and io_uring tree(s)