--- v5
+++ v7
@@ -1,3 +1,8 @@
+This intentionally leaves "fixup" changes separate - hopefully
+that is enough to fix vhost-net crashes reported here,
+but it helps me keep track of what changed.
+I will naturally squash them later when we are done.
+
 
 This adds infrastructure required for supporting
 multiple ring formats.
@@ -23,6 +28,11 @@
 Lightly tested.
 More testing would be very much appreciated.
 
+changes from v6:
+	- fixes some bugs introduced in v6 and v5
+
+changes from v5:
+	- addressed comments by Jason: squashed API changes, fixed up discard
 
 changes from v4:
 	- added used descriptor format independence
@@ -43,14 +53,16 @@
 	- typo fixes
 
 
-Michael S. Tsirkin (13):
+Michael S. Tsirkin (14):
   vhost: option to fetch descriptors through an independent struct
-  vhost: use batched version by default
-  vhost: batching fetches
-  vhost: cleanup fetch_buf return code handling
+  fixup! vhost: option to fetch descriptors through an independent
+    struct
+  vhost: use batched get_vq_desc version
   vhost/net: pass net specific struct pointer
   vhost: reorder functions
   vhost: format-independent API for used buffers
+  fixup! vhost: format-independent API for used buffers
+  fixup! vhost: use batched get_vq_desc version
   vhost/net: convert to new API: heads->bufs
   vhost/net: avoid iov length math
   vhost/test: convert to the buf API
@@ -58,13 +70,13 @@
   vhost/vsock: switch to the buf API
   vhost: drop head based APIs
 
- drivers/vhost/net.c   | 174 ++++++++++---------
+ drivers/vhost/net.c   | 174 +++++++++----------
  drivers/vhost/scsi.c  |  73 ++++----
  drivers/vhost/test.c  |  22 +--
- drivers/vhost/vhost.c | 380 +++++++++++++++++++++++++++---------------
+ drivers/vhost/vhost.c | 378 +++++++++++++++++++++++++++---------------
  drivers/vhost/vhost.h |  44 +++--
  drivers/vhost/vsock.c |  30 ++--
- 6 files changed, 441 insertions(+), 282 deletions(-)
+ 6 files changed, 439 insertions(+), 282 deletions(-)
 
 -- 
 MST