diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2019-01-04 14:02:59 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2019-01-04 14:02:59 -0500 |
commit | e4f2283cc6ffefbe414317a0d89b602811b577ac (patch) | |
tree | 127997705ed12fd5417abc22f58e939942032188 /fs/nfs | |
parent | 4addd2640fcaeb150b42a8a352b6c9d13d6c00af (diff) | |
parent | a40612ef0ee1e524aafee58d0e5713cf5fdb3d62 (diff) | |
parent | f91528955d0094ff2200632661d62ee64019c985 (diff) | |
download | linux-e4f2283cc6ffefbe414317a0d89b602811b577ac.tar.bz2 |
Merge branches 'misc.misc' and 'work.iov_iter' into for-linus