summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2019-01-04 14:02:59 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2019-01-04 14:02:59 -0500
commite4f2283cc6ffefbe414317a0d89b602811b577ac (patch)
tree127997705ed12fd5417abc22f58e939942032188 /fs/nfs
parent4addd2640fcaeb150b42a8a352b6c9d13d6c00af (diff)
parenta40612ef0ee1e524aafee58d0e5713cf5fdb3d62 (diff)
parentf91528955d0094ff2200632661d62ee64019c985 (diff)
downloadlinux-e4f2283cc6ffefbe414317a0d89b602811b577ac.tar.bz2
Merge branches 'misc.misc' and 'work.iov_iter' into for-linus