linux-next: manual merge of the aio tree with the aio-direct tree

Hi Benjamin, Today's linux-next merge of the aio tree got a conflict in fs/block_dev.c between commit b176eedb2a8b ("block_dev: add support for read_iter, write_iter") from the aio-direct tree and commit 73a7075e3f6e ("aio: Kill aio_rw_vect_retry()") from the aio tree. I fixed it up (see below) a

linux-next: manual merge of the aio tree with the aio-direct tree

Hi Benjamin, Today's linux-next merge of the aio tree got a conflict in fs/nfs/direct.c between commit 072d62aa3a83 ("nfs: simplify swap") from the aio-direct tree and commit 73a7075e3f6e ("aio: Kill aio_rw_vect_retry ()") from the aio tree. I fixed it up (the former also removed the line removed