linux-next: manual merge of the vhost tree with the net-next tree

Hi Michael, Today's linux-next merge of the vhost tree got a conflict in: tools/virtio/ringtest/Makefile between commit: 9fb6bc5b4a78 ("ptr_ring: ring test") from the net-next tree and commit: 139ab4d4e68b ("tools/virtio: add noring tool") from the vhost tree. I fixed it up (see below

linux-next: manual merge of the vhost tree with the net-next tree

Hi Michael, Today's linux-next merge of the vhost tree got a conflict in drivers/vhost/net.c between commit 70181d51209c ("vhost_net: remove tx polling state") from the net-next tree and commits 11569c7119a6 ("vhost: Allow device specific fields per vq"), 15a51679a0a1 ("vhost: Move vhost-net zeroc