[PULL] vhost: cleanups and fixes

2015-12-20 Thread Michael S. Tsirkin 
The following changes since commit 9f9499ae8e6415cefc4fe0a96ad0e27864353c89:

  Linux 4.4-rc5 (2015-12-13 17:42:58 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus

for you to fetch changes up to 74a599f09bec7419b2490039f0fb33bc8581ef7c:

  virtio/s390: handle error values in irb (2015-12-17 10:37:33 +0200)


virtio: fixes on top of 4.4-rc5

This includes a single fix for virtio ccw error handling.

Signed-off-by: Michael S. Tsirkin 


Cornelia Huck (1):
  virtio/s390: handle error values in irb

 drivers/s390/virtio/virtio_ccw.c | 62 
 1 file changed, 37 insertions(+), 25 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PULL] vhost: cleanups and fixes

2015-09-18 Thread Michael S. Tsirkin 
The following changes since commit 997e120843e82609c8d99a9d5714e6cf91e14cbe:

  virtio_balloon: do not change memory amount visible via /proc/meminfo 
(2015-09-08 13:32:11 +0300)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus

for you to fetch changes up to ad2aa04218de9bd734d593adb0ac59854ec0cb68:

  virtio/s390: handle failures of READ_VQ_CONF ccw (2015-09-16 12:48:08 +0300)


virtio: fixes on top of 4.3-rc1

This fixes the virtio-test tool, and improves
the error handling for virtio-ccw.

Signed-off-by: Michael S. Tsirkin 


Michael S. Tsirkin (3):
  tools/virtio: fix build after 4.2 changes
  vhost: move features to core
  tools/virtio: propagate V=X to kernel build

Pierre Morel (1):
  virtio/s390: handle failures of READ_VQ_CONF ccw

 drivers/vhost/vhost.h|  4 +++-
 tools/virtio/asm/barrier.h   |  2 ++
 tools/virtio/linux/export.h  |  3 +++
 tools/virtio/linux/kernel.h  |  8 
 drivers/s390/virtio/virtio_ccw.c | 10 +-
 drivers/vhost/net.c  |  3 +--
 drivers/vhost/scsi.c |  4 +---
 drivers/vhost/test.c |  3 +++
 tools/virtio/Makefile|  2 +-
 9 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 tools/virtio/linux/export.h
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PULL] vhost: cleanups and fixes

2015-09-09 Thread Michael S. Tsirkin 
The following changes since commit 64291f7db5bd8150a74ad2036f1037e6a0428df2:

  Linux 4.2 (2015-08-30 11:34:09 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus

for you to fetch changes up to 997e120843e82609c8d99a9d5714e6cf91e14cbe:

  virtio_balloon: do not change memory amount visible via /proc/meminfo 
(2015-09-08 13:32:11 +0300)


virtio: fixes and features 4.3

virtio-mmio can now be auto-loaded through acpi.
virtio blk supports extended partitions.
total memory is better reported when using virtio balloon with auto-deflate.
cache control is re-enabled when using virtio-blk in modern mode.

Signed-off-by: Michael S. Tsirkin 


Denis V. Lunev (2):
  virtio_ballon: change stub of release_pages_by_pfn
  virtio_balloon: do not change memory amount visible via /proc/meminfo

Fam Zheng (1):
  virtio-blk: Allow extended partitions

Graeme Gregory (1):
  virtio_mmio: add ACPI probing

Paolo Bonzini (1):
  virtio-blk: use VIRTIO_BLK_F_WCE and VIRTIO_BLK_F_CONFIG_WCE in virtio1

 drivers/block/virtio_blk.c  |  6 +++---
 drivers/virtio/virtio_balloon.c | 16 ++--
 drivers/virtio/virtio_mmio.c| 10 ++
 3 files changed, 23 insertions(+), 9 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PULL] vhost: cleanups and fixes

2015-07-15 Thread Michael S. Tsirkin 
On Wed, Jul 15, 2015 at 01:50:24PM +0300, Michael S. Tsirkin wrote:
 The following changes since commit 59a5b0f7bf74f88da6670bcbf924d8cc1e75b1ee:
 
   virtio-pci: alloc only resources actually used. (2015-06-24 08:15:09 +0200)
 
 are available in the git repository at:
 
   git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus
 
 for you to fetch changes up to c9ce42f72fd0ba180fd35539829e4139dca31494:
 
   vhost: add max_mem_regions module parameter (2015-07-13 23:17:19 +0300)
 
 
 virtio/vhost: fixes for 4.2
 
 Bugfixes and documentation fixes. Igor's patch that allows
 users to tweak memory table size is borderline,
 but it does fix known crashes, so I merged it.
 
 Signed-off-by: Michael S. Tsirkin m...@redhat.com

Ouch.  Turns out there was a bug in error handling here.
Linus, please don't pull this one yet, I will fix it up and
resend. I've deleted the tag for now so it won't get pulled
by mistake.

 
 Cornelia Huck (2):
   MAINTAINERS: separate section for s390 virtio drivers
   virtio/s390: rename drivers/s390/kvm - drivers/s390/virtio
 
 Igor Mammedov (3):
   vhost: use binary search instead of linear in find_region()
   vhost: extend memory regions allocation to vmalloc
   vhost: add max_mem_regions module parameter
 
 Michael S. Tsirkin (2):
   virtio_net: document VIRTIO_NET_CTRL_GUEST_OFFLOADS
   virtio: define virtio_pci_cfg_cap in header.
 
 Pierre Morel (1):
   9p/trans_virtio: reset virtio device on remove
 
 Stephen Rothwell (1):
   virtio scsi: fix unused variable warning
 
 Thomas Huth (1):
   virtio: Fix typecast of pointer in vring_init()
 
  include/uapi/linux/virtio_net.h   | 16 
  include/uapi/linux/virtio_pci.h   |  6 +++
  include/uapi/linux/virtio_ring.h  |  5 ++-
  drivers/s390/{kvm = virtio}/kvm_virtio.c |  0
  drivers/s390/{kvm = virtio}/virtio_ccw.c |  0
  drivers/scsi/virtio_scsi.c|  4 +-
  drivers/vhost/vhost.c | 67 
 +++
  net/9p/trans_virtio.c |  1 +
  MAINTAINERS   | 10 -
  drivers/s390/Makefile |  2 +-
  drivers/s390/{kvm = virtio}/Makefile |  0
  11 files changed, 91 insertions(+), 20 deletions(-)
  rename drivers/s390/{kvm = virtio}/kvm_virtio.c (100%)
  rename drivers/s390/{kvm = virtio}/virtio_ccw.c (100%)
  rename drivers/s390/{kvm = virtio}/Makefile (100%)
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PULL] vhost: cleanups and fixes

2015-07-15 Thread Michael S. Tsirkin 
The following changes since commit 59a5b0f7bf74f88da6670bcbf924d8cc1e75b1ee:

  virtio-pci: alloc only resources actually used. (2015-06-24 08:15:09 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus

for you to fetch changes up to c9ce42f72fd0ba180fd35539829e4139dca31494:

  vhost: add max_mem_regions module parameter (2015-07-13 23:17:19 +0300)


virtio/vhost: fixes for 4.2

Bugfixes and documentation fixes. Igor's patch that allows
users to tweak memory table size is borderline,
but it does fix known crashes, so I merged it.

Signed-off-by: Michael S. Tsirkin m...@redhat.com


Cornelia Huck (2):
  MAINTAINERS: separate section for s390 virtio drivers
  virtio/s390: rename drivers/s390/kvm - drivers/s390/virtio

Igor Mammedov (3):
  vhost: use binary search instead of linear in find_region()
  vhost: extend memory regions allocation to vmalloc
  vhost: add max_mem_regions module parameter

Michael S. Tsirkin (2):
  virtio_net: document VIRTIO_NET_CTRL_GUEST_OFFLOADS
  virtio: define virtio_pci_cfg_cap in header.

Pierre Morel (1):
  9p/trans_virtio: reset virtio device on remove

Stephen Rothwell (1):
  virtio scsi: fix unused variable warning

Thomas Huth (1):
  virtio: Fix typecast of pointer in vring_init()

 include/uapi/linux/virtio_net.h   | 16 
 include/uapi/linux/virtio_pci.h   |  6 +++
 include/uapi/linux/virtio_ring.h  |  5 ++-
 drivers/s390/{kvm = virtio}/kvm_virtio.c |  0
 drivers/s390/{kvm = virtio}/virtio_ccw.c |  0
 drivers/scsi/virtio_scsi.c|  4 +-
 drivers/vhost/vhost.c | 67 +++
 net/9p/trans_virtio.c |  1 +
 MAINTAINERS   | 10 -
 drivers/s390/Makefile |  2 +-
 drivers/s390/{kvm = virtio}/Makefile |  0
 11 files changed, 91 insertions(+), 20 deletions(-)
 rename drivers/s390/{kvm = virtio}/kvm_virtio.c (100%)
 rename drivers/s390/{kvm = virtio}/virtio_ccw.c (100%)
 rename drivers/s390/{kvm = virtio}/Makefile (100%)
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PULL] vhost: cleanups and fixes

2015-06-01 Thread Michael S. Tsirkin 
The following changes since commit c65b99f046843d2455aa231747b5a07a999a9f3d:

  Linux 4.1-rc6 (2015-05-31 19:01:07 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus

for you to fetch changes up to 8a7b19d8b542b87bccc3eaaf81dcc90a5ca48aea:

  include/uapi/linux/virtio_balloon.h: include linux/virtio_types.h (2015-06-01 
15:46:54 +0200)


virtio: last-minute fix for 4.1

This tweaks an exported user-space header to fix
build breakage for userspace using it.

Signed-off-by: Michael S. Tsirkin m...@redhat.com


Mikko Rapeli (1):
  include/uapi/linux/virtio_balloon.h: include linux/virtio_types.h

 include/uapi/linux/virtio_balloon.h | 1 +
 1 file changed, 1 insertion(+)
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PULL] vhost: cleanups and fixes

2015-06-01 Thread Michael S. Tsirkin 
The mail subject is wrong or course - the one in
the pull request is correct.
Sorry about that - this shouldn't interfere with merging it, I'll
correct it for future requests.

-- 
MST
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PULL] vhost: cleanups and fixes

2015-01-01 Thread Michael S. Tsirkin 
The following changes since commit b7392d2247cfe6771f95d256374f1a8e6a6f48d6:

  Linux 3.19-rc2 (2014-12-28 16:49:37 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus

for you to fetch changes up to 5d9a07b0de512b77bf28d2401e5fe3351f00a240:

  vhost: relax used address alignment (2014-12-29 10:55:06 +0200)


vhost: virtio 1.0 bugfix

There's a single change here, fixing a vhost bug where vhost initialization
fails due to used ring alignment check being too strict.

Cc: Rusty Russell ru...@rustcorp.com.au
Signed-off-by: Michael S. Tsirkin m...@redhat.com


Michael S. Tsirkin (2):
  virtio_ring: document alignment requirements
  vhost: relax used address alignment

 include/uapi/linux/virtio_ring.h |  7 +++
 drivers/vhost/vhost.c| 10 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PULL] vhost: cleanups and fixes

2014-12-18 Thread Michael S. Tsirkin 
The following changes since commit f01a2a811ae04124fc9382925038fcbbd2f0b7c8:

  virtio_ccw: finalize_features error handling (2014-12-09 21:42:06 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus

for you to fetch changes up to 5ff16110c637726111662c1df41afd9df7ef36bd:

  virtio_pci: restore module attributes (2014-12-17 00:59:40 +0200)


vhost/virtio: virtio 1.0 related fixes

Most importantly, this fixes using virtio_pci as a module.

Further, the big virtio 1.0 conversion missed a couple of places. This fixes
them up.

This isn't 100% sparse-clean yet because on many architectures get_user
triggers sparse warnings when used with __bitwise tag (when same tag is on both
pointer and value read).

I posted a patchset to fix it up by adding __force on all
arches that don't already have it (many do), when that's
merged these warnings will go away.

Cc: Rusty Russell ru...@rustcorp.com.au
Signed-off-by: Michael S. Tsirkin m...@redhat.com


Herbert Xu (1):
  virtio_pci: restore module attributes

Michael S. Tsirkin (15):
  virtio: set VIRTIO_CONFIG_S_FEATURES_OK on restore
  virtio_config: fix virtio_cread_bytes
  virtio_pci_common.h: drop VIRTIO_PCI_NO_LEGACY
  virtio_pci: move probe to common file
  virtio_pci: add VIRTIO_PCI_NO_LEGACY
  virtio: core support for config generation
  tools/virtio: more stubs
  tools/virtio: fix vringh test
  tools/virtio: 64 bit features
  tools/virtio: enable -Werror
  tools/virtio: add virtio 1.0 in virtio_test
  tools/virtio: add virtio 1.0 in vringh_test
  vringh: 64 bit features
  vringh: update for virtio 1.0 APIs
  mic/host: fix up virtio 1.0 APIs

 drivers/virtio/virtio_pci_common.h |   7 +-
 include/linux/virtio_config.h  |  29 +++-
 include/linux/vringh.h |  37 +-
 include/uapi/linux/virtio_pci.h|  15 ++--
 tools/virtio/linux/virtio.h|   1 +
 tools/virtio/linux/virtio_byteorder.h  |   8 +++
 tools/virtio/linux/virtio_config.h |  70 +-
 tools/virtio/uapi/linux/virtio_types.h |   1 +
 drivers/misc/mic/host/mic_debugfs.c|  18 +++--
 drivers/vhost/vringh.c | 125 -
 drivers/virtio/virtio.c|  37 ++
 drivers/virtio/virtio_pci_common.c |  39 +-
 drivers/virtio/virtio_pci_legacy.c |  24 +--
 tools/virtio/virtio_test.c |  15 +++-
 tools/virtio/vringh_test.c |   5 +-
 tools/virtio/Makefile  |   2 +-
 16 files changed, 324 insertions(+), 109 deletions(-)
 create mode 100644 tools/virtio/linux/virtio_byteorder.h
 create mode 100644 tools/virtio/uapi/linux/virtio_types.h
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PULL] vhost: cleanups and fixes

2014-11-13 Thread Michael S. Tsirkin 
The following changes since commit 206c5f60a3d902bc4b56dab2de3e88de5eb06108:

  Linux 3.18-rc4 (2014-11-09 14:55:29 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus

for you to fetch changes up to 65eca3a20264a8999570c269406196bd1ae23be7:

  virtio_console: move early VQ enablement (2014-11-13 09:53:26 +0200)

It seems like a good idea to merge this bugfix now, as it's clearly
a regression and several people complained.


virtio: bugfix for 3.18

This fixes a crash in virtio console
multi-channel mode that got introduced in -rc1.

Signed-off-by: Michael S. Tsirkin m...@redhat.com


Cornelia Huck (1):
  virtio_console: move early VQ enablement

 drivers/char/virtio_console.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PULL] vhost: cleanups and fixes

2014-06-25 Thread Michael S. Tsirkin 
The following changes since commit a497c3ba1d97fc69c1e78e7b96435ba8c2cb42ee:

  Linux 3.16-rc2 (2014-06-21 19:02:54 -1000)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus

for you to fetch changes up to 68404441557d8db5ac853379a4fb9c1adedea4fd:

  vhost-scsi: don't open-code kvfree (2014-06-23 09:22:48 +0300)


vhost: infrastructure fixes for 3.16

Two cleanup patches removing code duplication that got introduced by changes in
rc1.  Not fixing crashes, but I'd rather not carry the duplicate code until the
next merge window.

Signed-off-by: Michael S. Tsirkin m...@redhat.com


Michael S. Tsirkin (1):
  vhost-scsi: don't open-code kvfree

Romain Francoise (1):
  vhost-net: don't open-code kvfree

 drivers/vhost/net.c  | 12 ++--
 drivers/vhost/scsi.c | 12 ++--
 2 files changed, 4 insertions(+), 20 deletions(-)
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PULL] vhost: cleanups and fixes

2013-07-22 Thread Michael S. Tsirkin 
On Mon, Jul 15, 2013 at 09:31:49PM +0300, Michael S. Tsirkin wrote:
 The following changes since commit 09a34c8404c1d4c5782de319c02e1d742c57875c:
 
   vhost/test: update test after vhost cleanups (2013-07-07 18:02:25 +0300)
 
 are available in the git repository at:
 
   git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus
 
 for you to fetch changes up to 22fa90c7fb479694d6affebc049d21f06b714be6:
 
   vhost: Remove custom vhost rcu usage (2013-07-11 15:38:40 +0300)
 
 
 vhost: more fixes for 3.11
 
 This includes some fixes for vhost net and scsi drivers.
 The test module has already been reworked to avoid rcu
 usage, but the necessary core changes are missing,
 we fixed this.
 Unlikely to affect any real-world users, but it's
 early in the cycle so, let's merge them.
 
 Signed-off-by: Michael S. Tsirkin m...@redhat.com
 
 
 Asias He (3):
   vhost-net: Always access vq-private_data under vq mutex
   vhost-scsi: Always access vq-private_data under vq mutex
   vhost: Remove custom vhost rcu usage


Hi Linus,
Just checking that all's well with this PULL request.
If it's not merged, we'll have to revert the relevant change
in the test module.
Either way, need to keep them in sync.

Pls let me know,
Thanks

  drivers/vhost/net.c   | 37 -
  drivers/vhost/scsi.c  | 17 ++---
  drivers/vhost/test.c  |  6 ++
  drivers/vhost/vhost.h | 10 ++
  4 files changed, 26 insertions(+), 44 deletions(-)
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PULL] vhost: cleanups and fixes

2013-07-15 Thread Michael S. Tsirkin 
The following changes since commit 09a34c8404c1d4c5782de319c02e1d742c57875c:

  vhost/test: update test after vhost cleanups (2013-07-07 18:02:25 +0300)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus

for you to fetch changes up to 22fa90c7fb479694d6affebc049d21f06b714be6:

  vhost: Remove custom vhost rcu usage (2013-07-11 15:38:40 +0300)


vhost: more fixes for 3.11

This includes some fixes for vhost net and scsi drivers.
The test module has already been reworked to avoid rcu
usage, but the necessary core changes are missing,
we fixed this.
Unlikely to affect any real-world users, but it's
early in the cycle so, let's merge them.

Signed-off-by: Michael S. Tsirkin m...@redhat.com


Asias He (3):
  vhost-net: Always access vq-private_data under vq mutex
  vhost-scsi: Always access vq-private_data under vq mutex
  vhost: Remove custom vhost rcu usage

 drivers/vhost/net.c   | 37 -
 drivers/vhost/scsi.c  | 17 ++---
 drivers/vhost/test.c  |  6 ++
 drivers/vhost/vhost.h | 10 ++
 4 files changed, 26 insertions(+), 44 deletions(-)
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PULL] vhost: cleanups and fixes

2013-07-08 Thread Michael S. Tsirkin 
The following changes since commit 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376:

  Linux 3.10 (2013-06-30 15:13:29 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus

for you to fetch changes up to 09a34c8404c1d4c5782de319c02e1d742c57875c:

  vhost/test: update test after vhost cleanups (2013-07-07 18:02:25 +0300)


vhost: fixes and cleanups 3.11

This includes some fixes and cleanups for vhost net and scsi drivers.
The scsi driver changes will cause a conflict with  Nicholas Bellinger's scsi
target changes, but the conflicting commit in my tree simply renames some
variables so it's trivial to resolve.

Signed-off-by: Michael S. Tsirkin m...@redhat.com


Asias He (8):
  vhost: Simplify dev-vqs[i] access
  vhost-scsi: Remove unnecessary forward struct vhost_scsi declaration
  vhost-scsi: Rename struct vhost_scsi *s to *vs
  vhost-scsi: Make func indention more consistent
  vhost-scsi: Rename struct tcm_vhost_tpg *tv_tpg to *tpg
  vhost-scsi: Rename struct tcm_vhost_cmd *tv_cmd to *cmd
  vhost: Make vhost a separate module
  vhost: Make local function static

Michael S. Tsirkin (2):
  vhost-net: fix use-after-free in vhost_net_flush
  vhost/test: update test after vhost cleanups

 drivers/vhost/Kconfig  |   8 +
 drivers/vhost/Makefile |   3 +-
 drivers/vhost/net.c|  13 +-
 drivers/vhost/scsi.c   | 472 ++---
 drivers/vhost/test.c   |  33 ++--
 drivers/vhost/vhost.c  |  86 +++--
 drivers/vhost/vhost.h  |   2 +
 7 files changed, 356 insertions(+), 261 deletions(-)
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PULL] vhost: cleanups and fixes

2013-06-05 Thread Michael S. Tsirkin 
On Thu, May 02, 2013 at 12:49:42PM -0700, Linus Torvalds wrote:
 On Thu, May 2, 2013 at 12:33 PM, Michael S. Tsirkin m...@redhat.com wrote:
 
  I prefer not rebasing,
 
 Good.
 
will play with git to see why
  does request-pull get me a wrong diffstat and how
  to trick it into doing the right thing.
  Maybe merging my branch into master will do this.
 
 No, don't do an unnecessary merge just to get the diffstat right.
 
 git pull-request ends up assuming that there are no back-merges, and
 that you have a uniquely defined single shared merge base. That allows
 pull-request to just generate the diff directly from that merge base,
 without actually trying to do the merge itself (which may have
 conflicts etc).
 
 But because git pull-request doesn't actually *do* the merge, it means
 that it will fail to give the correct diffstat if the tree is
 complicated and has multiple merge bases, and it can't really figure
 what the original shared state was before the development.
 
 This is just one reason I do *not* want to see back-merges. They make
 history harder to read not just for humans.
 
 You can either ignore the problem (I'll see the real diffstat when I
 actually do the merge), or you can do a test-merge yourself (that you
 do *not* then push out in the development branch - keep it in a
 temporary branch for your own edification or just delete it after
 doing the merge, and don't do development on it!)
 
 In this case, it's an indirect back-merge: you back-merged a commit
 from the target tree that I have now merged, so it has become a
 back-merge. I'm not sure why you did that - if you needed to start
 from that state, it would actually have been better to just start at
 that state instead of merging it.

OK I'm in that situation again. I have some vhost-net patches that depend on
changes in tip.
But I also have a vhost-next branch with unrelated changes, that
I started from -rc3.

Previously I would just merge tip into vhost-next, then everyone's
happy, but it will create an implicit back-merge again, won't it?

So what should I do?

Sorry about being dense.

 But whatever. You can get the
 diffstat by using your merge as the base, so
 
 git diff -M --stat --summary bc7562355fda..
 
 in your branch should get the right result without any merges etc..
 But please do send me a proper pull request.
 
   Linus
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PULL] vhost: cleanups and fixes

2013-05-02 Thread Michael S. Tsirkin 
The following changes since commit c39904a0ac22cf05f5f44226457f6da0fe65457e:

  Merge branch 'master' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next (2013-04-26 
23:33:41 -0400)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus

for you to fetch changes up to 181c04a357bb791587c55a99362c2fdde2c64f18:

  vhost_scsi: module rename (2013-05-02 13:40:22 +0300)


vhost: cleanups and fixes for 3.10

Here are vhost cleanups and fixes by Asias He and myself.
They affect both vhost-net and vhost-scsi devices.
They also *depend* on both net-next and target-pending,
where the net and target commits these changes depend on
are already merged.
So merging through the common vhost tree.

Signed-off-by: Michael S. Tsirkin m...@redhat.com


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 (8):
  Merge branch 'for-next-merge' of 
git://git.kernel.org/.../nab/target-pending into vhost-net-next
  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
  vhost: src file renames
  tcm_vhost: header split up
  vhost_scsi: module rename

 drivers/infiniband/Kconfig |1 +
 drivers/infiniband/Makefile|1 +
 drivers/infiniband/ulp/isert/Kconfig   |5 +
 drivers/infiniband/ulp/isert/Makefile  |2 +
 drivers/infiniband/ulp/isert/ib_isert.c| 2281 
 drivers/infiniband/ulp/isert/ib_isert.h|  138 ++
 drivers/infiniband/ulp/isert/isert_proto.h |   47 +
 drivers/scsi/qla2xxx/qla_target.c  |   19 -
 drivers/scsi/qla2xxx/qla_target.h  |1 -
 drivers/target/iscsi/Makefile  |3 +-
 drivers/target/iscsi/iscsi_target.c| 1184 +++-
 drivers/target/iscsi/iscsi_target.h|3 +-
 drivers/target/iscsi/iscsi_target_auth.c   |   28 +-
 drivers/target/iscsi/iscsi_target_configfs.c   |   98 +-
 drivers/target/iscsi/iscsi_target_core.h   |   26 +-
 drivers/target/iscsi/iscsi_target_device.c |7 +-
 drivers/target/iscsi/iscsi_target_erl1.c   |   13 +-
 drivers/target/iscsi/iscsi_target_login.c  |  472 +++--
 drivers/target/iscsi/iscsi_target_login.h  |6 +
 drivers/target/iscsi/iscsi_target_nego.c   |  194 +-
 drivers/target/iscsi/iscsi_target_nego.h   |   11 +-
 drivers/target/iscsi/iscsi_target_parameters.c |   87 +-
 drivers/target/iscsi/iscsi_target_parameters.h |   16 +-
 drivers/target/iscsi/iscsi_target_tmr.c|4 +-
 drivers/target/iscsi/iscsi_target_tpg.c|6 +-
 drivers/target/iscsi/iscsi_target_transport.c  |   55 +
 drivers/target/iscsi/iscsi_target_util.c   |   53 +-
 drivers/target/iscsi/iscsi_target_util.h   |1 +
 drivers/target/target_core_file.c  |  122 +-
 drivers/target/target_core_iblock.c|  108 +-
 drivers/target/target_core_sbc.c   |   85 +
 drivers/target/target_core_transport.c |   13 +-
 drivers/target/tcm_fc/tfc_io.c |9 +-
 drivers/target/tcm_fc/tfc_sess.c   |9 +-
 drivers/vhost/Kconfig  |   10 +-
 drivers/vhost/Kconfig.tcm  |6 -
 drivers/vhost/Makefile |3 +-
 drivers/vhost/net.c|  255 ++-
 drivers/vhost/{tcm_vhost.c = scsi.c}  |  507 +-
 drivers/vhost/tcm_vhost.h  |  115 --
 drivers/vhost/test.c   |9 +-
 drivers/vhost/vhost.c  |  153 +-
 drivers/vhost/vhost.h  |   32 +-
 include/target/iscsi/iscsi_transport.h |   83 +
 include/target/target_core_backend.h   |4 +
 include/target/target_core_fabric.h|2 +-
 include/uapi/linux/vhost.h |   28 +
 47 files changed, 4985 insertions(+), 1330 deletions(-)
 create mode 100644 drivers/infiniband/ulp/isert/Kconfig
 create mode 100644 drivers/infiniband/ulp/isert/Makefile
 create mode 100644 drivers/infiniband/ulp/isert/ib_isert.c
 create mode 100644 drivers/infiniband/ulp/isert/ib_isert.h
 create mode 100644 drivers/infiniband/ulp/isert/isert_proto.h
 create mode 100644 drivers/target/iscsi/iscsi_target_transport.c
 delete mode 100644 drivers/vhost/Kconfig.tcm
 rename drivers/vhost/{tcm_vhost.c = scsi.c} (76%)
 delete mode 100644 drivers/vhost/tcm_vhost.h
 create mode 100644 include/target/iscsi/iscsi_transport.h
--
To unsubscribe from this list: send the line

Re: [PULL] vhost: cleanups and fixes

2013-05-02 Thread Nicholas A. Bellinger 
On Thu, 2013-05-02 at 13:53 +0300, Michael S. Tsirkin wrote:
 The following changes since commit c39904a0ac22cf05f5f44226457f6da0fe65457e:
 
   Merge branch 'master' of 
 git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next (2013-04-26 
 23:33:41 -0400)
 
 are available in the git repository at:
 
 
   git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus
 
 for you to fetch changes up to 181c04a357bb791587c55a99362c2fdde2c64f18:
 
   vhost_scsi: module rename (2013-05-02 13:40:22 +0300)
 
 
 vhost: cleanups and fixes for 3.10
 
 Here are vhost cleanups and fixes by Asias He and myself.
 They affect both vhost-net and vhost-scsi devices.
 They also *depend* on both net-next and target-pending,
 where the net and target commits these changes depend on
 are already merged.
 So merging through the common vhost tree.
 
 Signed-off-by: Michael S. Tsirkin m...@redhat.com
 

Just FYI, if this PULL request is going to Linus directly, you'll
probably want to rebase a branch atop a more recent mainline HEAD in
order to produce a correct diffstat, instead of the one including the
target-pending/for-next-merge merge commit below..

Then again, asking Linus what he prefers for this type of scenario never
hurt anyone either.  ;)

--nab

 
 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 (8):
   Merge branch 'for-next-merge' of 
 git://git.kernel.org/.../nab/target-pending into vhost-net-next
   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
   vhost: src file renames
   tcm_vhost: header split up
   vhost_scsi: module rename
 
  drivers/infiniband/Kconfig |1 +
  drivers/infiniband/Makefile|1 +
  drivers/infiniband/ulp/isert/Kconfig   |5 +
  drivers/infiniband/ulp/isert/Makefile  |2 +
  drivers/infiniband/ulp/isert/ib_isert.c| 2281 
 
  drivers/infiniband/ulp/isert/ib_isert.h|  138 ++
  drivers/infiniband/ulp/isert/isert_proto.h |   47 +
  drivers/scsi/qla2xxx/qla_target.c  |   19 -
  drivers/scsi/qla2xxx/qla_target.h  |1 -
  drivers/target/iscsi/Makefile  |3 +-
  drivers/target/iscsi/iscsi_target.c| 1184 +++-
  drivers/target/iscsi/iscsi_target.h|3 +-
  drivers/target/iscsi/iscsi_target_auth.c   |   28 +-
  drivers/target/iscsi/iscsi_target_configfs.c   |   98 +-
  drivers/target/iscsi/iscsi_target_core.h   |   26 +-
  drivers/target/iscsi/iscsi_target_device.c |7 +-
  drivers/target/iscsi/iscsi_target_erl1.c   |   13 +-
  drivers/target/iscsi/iscsi_target_login.c  |  472 +++--
  drivers/target/iscsi/iscsi_target_login.h  |6 +
  drivers/target/iscsi/iscsi_target_nego.c   |  194 +-
  drivers/target/iscsi/iscsi_target_nego.h   |   11 +-
  drivers/target/iscsi/iscsi_target_parameters.c |   87 +-
  drivers/target/iscsi/iscsi_target_parameters.h |   16 +-
  drivers/target/iscsi/iscsi_target_tmr.c|4 +-
  drivers/target/iscsi/iscsi_target_tpg.c|6 +-
  drivers/target/iscsi/iscsi_target_transport.c  |   55 +
  drivers/target/iscsi/iscsi_target_util.c   |   53 +-
  drivers/target/iscsi/iscsi_target_util.h   |1 +
  drivers/target/target_core_file.c  |  122 +-
  drivers/target/target_core_iblock.c|  108 +-
  drivers/target/target_core_sbc.c   |   85 +
  drivers/target/target_core_transport.c |   13 +-
  drivers/target/tcm_fc/tfc_io.c |9 +-
  drivers/target/tcm_fc/tfc_sess.c   |9 +-
  drivers/vhost/Kconfig  |   10 +-
  drivers/vhost/Kconfig.tcm  |6 -
  drivers/vhost/Makefile |3 +-
  drivers/vhost/net.c|  255 ++-
  drivers/vhost/{tcm_vhost.c = scsi.c}  |  507 +-
  drivers/vhost/tcm_vhost.h  |  115 --
  drivers/vhost/test.c   |9 +-
  drivers/vhost/vhost.c  |  153 +-
  drivers/vhost/vhost.h  |   32 +-
  include/target/iscsi/iscsi_transport.h |   83 +
  include/target/target_core_backend.h   |4 +
  include/target/target_core_fabric.h|2 +-
  include/uapi/linux/vhost.h |   28 +
  47 files changed, 4985 insertions(+), 1330 deletions(-)
  create mode 100644 drivers/infiniband/ulp/isert/Kconfig
  create mode 100644

Re: [PULL] vhost: cleanups and fixes

2013-05-02 Thread Michael S. Tsirkin 
On Thu, May 02, 2013 at 11:55:29AM -0700, Nicholas A. Bellinger wrote:
 On Thu, 2013-05-02 at 13:53 +0300, Michael S. Tsirkin wrote:
  The following changes since commit c39904a0ac22cf05f5f44226457f6da0fe65457e:
  
Merge branch 'master' of 
  git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next (2013-04-26 
  23:33:41 -0400)
  
  are available in the git repository at:
  
  
git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git tags/for_linus
  
  for you to fetch changes up to 181c04a357bb791587c55a99362c2fdde2c64f18:
  
vhost_scsi: module rename (2013-05-02 13:40:22 +0300)
  
  
  vhost: cleanups and fixes for 3.10
  
  Here are vhost cleanups and fixes by Asias He and myself.
  They affect both vhost-net and vhost-scsi devices.
  They also *depend* on both net-next and target-pending,
  where the net and target commits these changes depend on
  are already merged.
  So merging through the common vhost tree.
  
  Signed-off-by: Michael S. Tsirkin m...@redhat.com
  
 
 Just FYI, if this PULL request is going to Linus directly, you'll
 probably want to rebase a branch atop a more recent mainline HEAD in
 order to produce a correct diffstat, instead of the one including the
 target-pending/for-next-merge merge commit below..
 
 Then again, asking Linus what he prefers for this type of scenario never
 hurt anyone either.  ;)
 
 --nab


Oops I did something wrong and Linus was not on the To list at all :(
I'll have to repost.
I prefer not rebasing, will play with git to see why
does request-pull get me a wrong diffstat and how
to trick it into doing the right thing.
Maybe merging my branch into master will do this.


  
  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 (8):
Merge branch 'for-next-merge' of 
  git://git.kernel.org/.../nab/target-pending into vhost-net-next
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
vhost: src file renames
tcm_vhost: header split up
vhost_scsi: module rename
  
   drivers/infiniband/Kconfig |1 +
   drivers/infiniband/Makefile|1 +
   drivers/infiniband/ulp/isert/Kconfig   |5 +
   drivers/infiniband/ulp/isert/Makefile  |2 +
   drivers/infiniband/ulp/isert/ib_isert.c| 2281 
  
   drivers/infiniband/ulp/isert/ib_isert.h|  138 ++
   drivers/infiniband/ulp/isert/isert_proto.h |   47 +
   drivers/scsi/qla2xxx/qla_target.c  |   19 -
   drivers/scsi/qla2xxx/qla_target.h  |1 -
   drivers/target/iscsi/Makefile  |3 +-
   drivers/target/iscsi/iscsi_target.c| 1184 +++-
   drivers/target/iscsi/iscsi_target.h|3 +-
   drivers/target/iscsi/iscsi_target_auth.c   |   28 +-
   drivers/target/iscsi/iscsi_target_configfs.c   |   98 +-
   drivers/target/iscsi/iscsi_target_core.h   |   26 +-
   drivers/target/iscsi/iscsi_target_device.c |7 +-
   drivers/target/iscsi/iscsi_target_erl1.c   |   13 +-
   drivers/target/iscsi/iscsi_target_login.c  |  472 +++--
   drivers/target/iscsi/iscsi_target_login.h  |6 +
   drivers/target/iscsi/iscsi_target_nego.c   |  194 +-
   drivers/target/iscsi/iscsi_target_nego.h   |   11 +-
   drivers/target/iscsi/iscsi_target_parameters.c |   87 +-
   drivers/target/iscsi/iscsi_target_parameters.h |   16 +-
   drivers/target/iscsi/iscsi_target_tmr.c|4 +-
   drivers/target/iscsi/iscsi_target_tpg.c|6 +-
   drivers/target/iscsi/iscsi_target_transport.c  |   55 +
   drivers/target/iscsi/iscsi_target_util.c   |   53 +-
   drivers/target/iscsi/iscsi_target_util.h   |1 +
   drivers/target/target_core_file.c  |  122 +-
   drivers/target/target_core_iblock.c|  108 +-
   drivers/target/target_core_sbc.c   |   85 +
   drivers/target/target_core_transport.c |   13 +-
   drivers/target/tcm_fc/tfc_io.c |9 +-
   drivers/target/tcm_fc/tfc_sess.c   |9 +-
   drivers/vhost/Kconfig  |   10 +-
   drivers/vhost/Kconfig.tcm  |6 -
   drivers/vhost/Makefile |3 +-
   drivers/vhost/net.c|  255 ++-
   drivers/vhost/{tcm_vhost.c = scsi.c}  |  507 +-
   drivers/vhost/tcm_vhost.h  |  115 --
   drivers/vhost/test.c   |9 +-
   drivers/vhost/vhost.c  |  153 +-

Re: [PULL] vhost: cleanups and fixes

2013-05-02 Thread Linus Torvalds 
On Thu, May 2, 2013 at 12:33 PM, Michael S. Tsirkin m...@redhat.com wrote:

 I prefer not rebasing,

Good.

   will play with git to see why
 does request-pull get me a wrong diffstat and how
 to trick it into doing the right thing.
 Maybe merging my branch into master will do this.

No, don't do an unnecessary merge just to get the diffstat right.

git pull-request ends up assuming that there are no back-merges, and
that you have a uniquely defined single shared merge base. That allows
pull-request to just generate the diff directly from that merge base,
without actually trying to do the merge itself (which may have
conflicts etc).

But because git pull-request doesn't actually *do* the merge, it means
that it will fail to give the correct diffstat if the tree is
complicated and has multiple merge bases, and it can't really figure
what the original shared state was before the development.

This is just one reason I do *not* want to see back-merges. They make
history harder to read not just for humans.

You can either ignore the problem (I'll see the real diffstat when I
actually do the merge), or you can do a test-merge yourself (that you
do *not* then push out in the development branch - keep it in a
temporary branch for your own edification or just delete it after
doing the merge, and don't do development on it!)

In this case, it's an indirect back-merge: you back-merged a commit
from the target tree that I have now merged, so it has become a
back-merge. I'm not sure why you did that - if you needed to start
from that state, it would actually have been better to just start at
that state instead of merging it. But whatever. You can get the
diffstat by using your merge as the base, so

git diff -M --stat --summary bc7562355fda..

in your branch should get the right result without any merges etc..
But please do send me a proper pull request.

  Linus
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PULL] vhost: cleanups and fixes for 3.10

2013-05-01 Thread 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(-)
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

2013-05-01 Thread 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(-)


--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

2013-05-01 Thread 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(-)
 
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

2013-05-01 Thread David Miller 
From: Michael S. Tsirkin m...@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.
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

2013-05-01 Thread Michael S. Tsirkin 
On Wed, May 01, 2013 at 03:05:48PM -0400, David Miller wrote:
 From: Michael S. Tsirkin m...@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.
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html