Skip to contentSkip to conversation

vhost: cleanups and fixes for 3.10

GIT PULL Michael S. Tsirkin 3 participants 5 messages May 1, 2013 – May 2, 2013

Subsystems (4)
lore
Share & tools
lore

Michael S. Tsirkin

author maintainer
#0 lore raw

Please pull the following vhost core updates for 3.10 - they affect both vhost-net and vhost-scsi devices.
They also *depend* on both net-next and target-pending. Since Linus merged target-pending but not net-next at this point, merging through the net tree seems to make sense.

The following changes since commit bc7562355fda8075793bf66094cda573206ec693:

Merge branch 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending into vhost-net-next (2013-05-01 09:16:50 +0300)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost-net-next

for you to fetch changes up to 150b9e51ae975ca1fe468c565870fbc4a96e0574:

vhost: fix error handling in RESET_OWNER ioctl (2013-05-01 10:02:54 +0300)

----------------------------------------------------------------
Asias He (3):
vhost: Allow device specific fields per vq
tcm_vhost: Wait for pending requests in vhost_scsi_flush()
vhost: move vhost-net zerocopy fields to net.c

Michael S. Tsirkin (4):
tcm_vhost: document inflight ref-counting use
vhost: move per-vq net specific fields out to net
tcm_vhost: remove virtio-net.h dependency
vhost: fix error handling in RESET_OWNER ioctl

 drivers/vhost/net.c       | 255 ++++++++++++++++++++++++++++++++++++----------
 drivers/vhost/tcm_vhost.c | 154 ++++++++++++++++++++++++----
 drivers/vhost/tcm_vhost.h |   3 +
 drivers/vhost/test.c      |   9 +-
 drivers/vhost/vhost.c     | 153 +++++++++-------------------
 drivers/vhost/vhost.h     |  32 +-----
 6 files changed, 400 insertions(+), 206 deletions(-)
#1 lore raw
Quoted 6 lines · Michael S. Tsirkin

Please pull the following vhost core updates for 3.10 - they affect both vhost-net and vhost-scsi devices.
They also *depend* on both net-next and target-pending. Since Linus merged target-pending but not net-next at this point, merging through the net tree seems to make sense.

Perfectly fine by me..

Btw, I'll be sending another PULL request next week for some other minor -rc1 items, so if DaveM prefers I'm happy to include this series in that PULL instead.

--nab

Quoted 32 lines

The following changes since commit bc7562355fda8075793bf66094cda573206ec693:

Merge branch 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending into vhost-net-next (2013-05-01 09:16:50 +0300)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost-net-next

for you to fetch changes up to 150b9e51ae975ca1fe468c565870fbc4a96e0574:

vhost: fix error handling in RESET_OWNER ioctl (2013-05-01 10:02:54 +0300)

----------------------------------------------------------------
Asias He (3):
vhost: Allow device specific fields per vq
tcm_vhost: Wait for pending requests in vhost_scsi_flush()
vhost: move vhost-net zerocopy fields to net.c

Michael S. Tsirkin (4):
tcm_vhost: document inflight ref-counting use
vhost: move per-vq net specific fields out to net
tcm_vhost: remove virtio-net.h dependency
vhost: fix error handling in RESET_OWNER ioctl

 drivers/vhost/net.c       | 255 ++++++++++++++++++++++++++++++++++++----------
 drivers/vhost/tcm_vhost.c | 154 ++++++++++++++++++++++++----
 drivers/vhost/tcm_vhost.h |   3 +
 drivers/vhost/test.c      |   9 +-
 drivers/vhost/vhost.c     | 153 +++++++++-------------------
 drivers/vhost/vhost.h     |  32 +-----
 6 files changed, 400 insertions(+), 206 deletions(-)
author maintainer
#2 lore raw
Quoted 8 lines · Nicholas A. Bellinger
Quoted 6 lines · Michael S. Tsirkin

Please pull the following vhost core updates for 3.10 - they affect both vhost-net and vhost-scsi devices.
They also *depend* on both net-next and target-pending. Since Linus merged target-pending but not net-next at this point, merging through the net tree seems to make sense.

Quoted 7 lines

Perfectly fine by me..

Btw, I'll be sending another PULL request next week for some other minor -rc1 items, so if DaveM prefers I'm happy to include this series in that PULL instead.

--nab

Yes but it depends on stuff in net-next. That would pull in a lot.

Quoted 33 lines
Quoted 32 lines

The following changes since commit bc7562355fda8075793bf66094cda573206ec693:

Merge branch 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending into vhost-net-next (2013-05-01 09:16:50 +0300)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost-net-next

for you to fetch changes up to 150b9e51ae975ca1fe468c565870fbc4a96e0574:

vhost: fix error handling in RESET_OWNER ioctl (2013-05-01 10:02:54 +0300)

----------------------------------------------------------------
Asias He (3):
vhost: Allow device specific fields per vq
tcm_vhost: Wait for pending requests in vhost_scsi_flush()
vhost: move vhost-net zerocopy fields to net.c

Michael S. Tsirkin (4):
tcm_vhost: document inflight ref-counting use
vhost: move per-vq net specific fields out to net
tcm_vhost: remove virtio-net.h dependency
vhost: fix error handling in RESET_OWNER ioctl

 drivers/vhost/net.c       | 255 ++++++++++++++++++++++++++++++++++++----------
 drivers/vhost/tcm_vhost.c | 154 ++++++++++++++++++++++++----
 drivers/vhost/tcm_vhost.h |   3 +
 drivers/vhost/test.c      |   9 +-
 drivers/vhost/vhost.c     | 153 +++++++++-------------------
 drivers/vhost/vhost.h     |  32 +-----
 6 files changed, 400 insertions(+), 206 deletions(-)
maintainer
#3 lore raw
In reply to Michael S. Tsirkin

From: "Michael S. Tsirkin" <[email protected]>
Date: Wed, 1 May 2013 18:01:31 +0300

Quoted 5 lines

Please pull the following vhost core updates for 3.10 - they affect both vhost-net and vhost-scsi devices.
They also *depend* on both net-next and target-pending. Since Linus merged target-pending but not net-next at this point, merging through the net tree seems to make sense.

I don't have target-pending in my tree though and I'm not going to pull it in just for this.

Since you have such a multi-dependency situation, just ask Linus to pull this directly after I push net-next to him, which should be later today.

Thanks.

author maintainer
#4 lore raw
Quoted 9 lines · David Miller

From: "Michael S. Tsirkin" <[email protected]>
Date: Wed, 1 May 2013 18:01:31 +0300

Quoted 5 lines

Please pull the following vhost core updates for 3.10 - they affect both vhost-net and vhost-scsi devices.
They also *depend* on both net-next and target-pending. Since Linus merged target-pending but not net-next at this point, merging through the net tree seems to make sense.

Quoted 7 lines

I don't have target-pending in my tree though and I'm not going to pull it in just for this.

Since you have such a multi-dependency situation, just ask Linus to pull this directly after I push net-next to him, which should be later today.

Thanks.

OK, thanks.