[PULL] vhost: cleanups and fixes for 3.10

[PULL] vhost: cleanups and fixes for 3.10

[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.

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(-)

Re: [PULL] vhost: cleanups and fixes for 3.10

[Nicholas A. Bellinger]

On Wed, 2013-05-01 at 18:01 +0300, Michael S. Tsirkin wrote:
> 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

> 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(-)

Re: [PULL] vhost: cleanups and fixes for 3.10

[Michael S. Tsirkin]

On Wed, May 01, 2013 at 09:05:35AM -0700, Nicholas A. Bellinger wrote:
> On Wed, 2013-05-01 at 18:01 +0300, Michael S. Tsirkin wrote:
> > 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

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

> > 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(-)
> 

Re: [PULL] vhost: cleanups and fixes for 3.10

[David Miller]

From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Wed, 1 May 2013 18:01:31 +0300

> 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.

Re: [PULL] vhost: cleanups and fixes for 3.10

[Michael S. Tsirkin]

On Wed, May 01, 2013 at 03:05:48PM -0400, David Miller wrote:
> From: "Michael S. Tsirkin" <mst@redhat.com>
> Date: Wed, 1 May 2013 18:01:31 +0300
> 
> > 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.

OK, thanks.