Skip to contentSkip to conversation

vhost: tcm_vhost fixes for 3.9

GIT PULL Applied Michael S. Tsirkin 3 participants 7 messages Mar 18, 2013

Subsystems (4)
Networking Network drivers KVM virtio core
lore
Share & tools
lore

Michael S. Tsirkin

author maintainer
#0 lore raw

The following changes since commit 8c6216d7f118a128678270824b6a1286a63863ca:

Revert "ip_gre: make ipgre_tunnel_xmit() not parse network header as IP unconditionally" (2013-03-16 23:00:41 -0400)

are available in the git repository at:

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

for you to fetch changes up to deb7cb067dabd3be625eaf5495da8bdc97377fc1:

tcm_vhost: Flush vhost_work in vhost_scsi_flush() (2013-03-17 13:04:14 +0200)

----------------------------------------------------------------
Asias He (2):
tcm_vhost: Add missed lock in vhost_scsi_clear_endpoint()
tcm_vhost: Flush vhost_work in vhost_scsi_flush()

 drivers/vhost/tcm_vhost.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
maintainer
#1 lore raw

From: "Michael S. Tsirkin" <[email protected]>
Date: Mon, 18 Mar 2013 13:20:03 +0200

Quoted 11 lines

The following changes since commit 8c6216d7f118a128678270824b6a1286a63863ca:

Revert "ip_gre: make ipgre_tunnel_xmit() not parse network header as IP unconditionally" (2013-03-16 23:00:41 -0400)

are available in the git repository at:

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

for you to fetch changes up to deb7cb067dabd3be625eaf5495da8bdc97377fc1:

tcm_vhost: Flush vhost_work in vhost_scsi_flush() (2013-03-17 13:04:14 +0200)

This is a scsi driver, I therefore don't think this pull request is for me.

Please avoid such confusion in the future, and don't use branch names like "vhost-net" for SCSI driver fixes.

Thanks.

author maintainer
#2 lore raw
Quoted 13 lines · David Miller

From: "Michael S. Tsirkin" <[email protected]>
Date: Mon, 18 Mar 2013 13:20:03 +0200

Quoted 10 lines

The following changes since commit 8c6216d7f118a128678270824b6a1286a63863ca:

Revert "ip_gre: make ipgre_tunnel_xmit() not parse network header as IP unconditionally" (2013-03-16 23:00:41 -0400)

are available in the git repository at:

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

for you to fetch changes up to deb7cb067dabd3be625eaf5495da8bdc97377fc1:

Quoted 8 lines
Quoted 1 line

tcm_vhost: Flush vhost_work in vhost_scsi_flush() (2013-03-17 13:04:14 +0200)

This is a scsi driver, I therefore don't think this pull request is for me.

Please avoid such confusion in the future, and don't use branch names like "vhost-net" for SCSI driver fixes.

Thanks.

We are sharing quite a bit of code, so it's a common tree. There was a vhost-net patch there too but you picked it up directly so I dropped that and what's left is vhost-scsi. Typically vhost-net dominates so I'm just used to merging all vhost things through you but if you think it's wrong I can send it directly to Linus.

Signature · 1 line
MST
maintainer
#3 lore raw

From: "Michael S. Tsirkin" <[email protected]>
Date: Mon, 18 Mar 2013 21:54:43 +0200

Quoted 21 lines · David Miller
Quoted 20 lines

From: "Michael S. Tsirkin" <[email protected]>
Date: Mon, 18 Mar 2013 13:20:03 +0200

Quoted 11 lines

The following changes since commit 8c6216d7f118a128678270824b6a1286a63863ca:

Revert "ip_gre: make ipgre_tunnel_xmit() not parse network header as IP unconditionally" (2013-03-16 23:00:41 -0400)

are available in the git repository at:

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

for you to fetch changes up to deb7cb067dabd3be625eaf5495da8bdc97377fc1:

tcm_vhost: Flush vhost_work in vhost_scsi_flush() (2013-03-17 13:04:14 +0200)

This is a scsi driver, I therefore don't think this pull request is for me.

Please avoid such confusion in the future, and don't use branch names like "vhost-net" for SCSI driver fixes.

Quoted 8 lines
Quoted 1 line

Thanks.

We are sharing quite a bit of code, so it's a common tree. There was a vhost-net patch there too but you picked it up directly so I dropped that and what's left is vhost-scsi. Typically vhost-net dominates so I'm just used to merging all vhost things through you but if you think it's wrong I can send it directly to Linus.

Just like any other "bus" or "layer" for drivers, you should really just send the networking bits my way.

Now, in situations where some generic vhost infrastructure is necessary for a vhost-net specific change, that might be a situation where we can merge the infrastructure change into my tree so that the networking bits can go in too.

#4 lore raw
In reply to Michael S. Tsirkin
Quoted 21 lines · Michael S. Tsirkin
Quoted 20 lines · David Miller

From: "Michael S. Tsirkin" <[email protected]>
Date: Mon, 18 Mar 2013 13:20:03 +0200

Quoted 11 lines

The following changes since commit 8c6216d7f118a128678270824b6a1286a63863ca:

Revert "ip_gre: make ipgre_tunnel_xmit() not parse network header as IP unconditionally" (2013-03-16 23:00:41 -0400)

are available in the git repository at:

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

for you to fetch changes up to deb7cb067dabd3be625eaf5495da8bdc97377fc1:

tcm_vhost: Flush vhost_work in vhost_scsi_flush() (2013-03-17 13:04:14 +0200)

This is a scsi driver, I therefore don't think this pull request is for me.

Please avoid such confusion in the future, and don't use branch names like "vhost-net" for SCSI driver fixes.

Quoted 9 lines
Quoted 1 line

Thanks.

We are sharing quite a bit of code, so it's a common tree. There was a vhost-net patch there too but you picked it up directly so I dropped that and what's left is vhost-scsi. Typically vhost-net dominates so I'm just used to merging all vhost things through you but if you think it's wrong I can send it directly to Linus.

I'll be sending out a target-pending 3.9-rc-fixes pull request later in the week, and am happy to include this series if you'd like.

--nab

author maintainer Acked-by
#5 lore raw
Quoted 32 lines · Nicholas A. Bellinger
Quoted 21 lines · Michael S. Tsirkin
Quoted 20 lines · David Miller

From: "Michael S. Tsirkin" <[email protected]>
Date: Mon, 18 Mar 2013 13:20:03 +0200

Quoted 11 lines

The following changes since commit 8c6216d7f118a128678270824b6a1286a63863ca:

Revert "ip_gre: make ipgre_tunnel_xmit() not parse network header as IP unconditionally" (2013-03-16 23:00:41 -0400)

are available in the git repository at:

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

for you to fetch changes up to deb7cb067dabd3be625eaf5495da8bdc97377fc1:

tcm_vhost: Flush vhost_work in vhost_scsi_flush() (2013-03-17 13:04:14 +0200)

This is a scsi driver, I therefore don't think this pull request is for me.

Please avoid such confusion in the future, and don't use branch names like "vhost-net" for SCSI driver fixes.

Quoted 9 lines
Quoted 1 line

Thanks.

We are sharing quite a bit of code, so it's a common tree. There was a vhost-net patch there too but you picked it up directly so I dropped that and what's left is vhost-scsi. Typically vhost-net dominates so I'm just used to merging all vhost things through you but if you think it's wrong I can send it directly to Linus.

Quoted 4 lines

I'll be sending out a target-pending 3.9-rc-fixes pull request later in the week, and am happy to include this series if you'd like.

--nab

Sure, go ahead. You can add

Acked-by Michael S. Tsirkin <[email protected]>

to the patches.

Signature · 1 line
MST
Applied
#6 lore raw
Quoted 33 lines · Michael S. Tsirkin
Quoted 32 lines · Nicholas A. Bellinger
Quoted 30 lines · Michael S. Tsirkin
Quoted 13 lines · David Miller

From: "Michael S. Tsirkin" <[email protected]>
Date: Mon, 18 Mar 2013 13:20:03 +0200

Quoted 10 lines

The following changes since commit 8c6216d7f118a128678270824b6a1286a63863ca:

Revert "ip_gre: make ipgre_tunnel_xmit() not parse network header as IP unconditionally" (2013-03-16 23:00:41 -0400)

are available in the git repository at:

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

for you to fetch changes up to deb7cb067dabd3be625eaf5495da8bdc97377fc1:

Quoted 8 lines
Quoted 1 line

tcm_vhost: Flush vhost_work in vhost_scsi_flush() (2013-03-17 13:04:14 +0200)

This is a scsi driver, I therefore don't think this pull request is for me.

Please avoid such confusion in the future, and don't use branch names like "vhost-net" for SCSI driver fixes.

Thanks.

We are sharing quite a bit of code, so it's a common tree. There was a vhost-net patch there too but you picked it up directly so I dropped that and what's left is vhost-scsi. Typically vhost-net dominates so I'm just used to merging all vhost things through you but if you think it's wrong I can send it directly to Linus.

Quoted 9 lines
Quoted 4 lines

I'll be sending out a target-pending 3.9-rc-fixes pull request later in the week, and am happy to include this series if you'd like.

--nab

Sure, go ahead. You can add

Acked-by Michael S. Tsirkin <[email protected]>

to the patches.

Applied to target-pending/master.

Thanks MST & Asias!