From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754828Ab3CRUF3 (ORCPT ); Mon, 18 Mar 2013 16:05:29 -0400 Received: from shards.monkeyblade.net ([149.20.54.216]:33154 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751779Ab3CRUF1 (ORCPT ); Mon, 18 Mar 2013 16:05:27 -0400 Date: Mon, 18 Mar 2013 16:05:23 -0400 (EDT) Message-Id: <20130318.160523.1621054103077556675.davem@davemloft.net> To: mst@redhat.com Cc: kvm@vger.kernel.org, virtualization@lists.osdl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, asias@redhat.com, nab@linux-iscsi.org, target-devel@vger.kernel.org Subject: Re: [PULL] vhost: tcm_vhost fixes for 3.9 From: David Miller In-Reply-To: <20130318195443.GB19761@redhat.com> References: <20130318112003.GA7809@redhat.com> <20130318.130136.1629094222097780420.davem@davemloft.net> <20130318195443.GB19761@redhat.com> X-Mailer: Mew version 6.5 on Emacs 24.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (shards.monkeyblade.net [0.0.0.0]); Mon, 18 Mar 2013 13:05:31 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Michael S. Tsirkin" Date: Mon, 18 Mar 2013 21:54:43 +0200 > On Mon, Mar 18, 2013 at 01:01:36PM -0400, David Miller wrote: >> From: "Michael S. Tsirkin" >> Date: Mon, 18 Mar 2013 13:20:03 +0200 >> >> > 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. > > 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.