From: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: kvm@vger.kernel.org, virtualization@lists.osdl.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
asias@redhat.com, target-devel <target-devel@vger.kernel.org>
Subject: Re: [PULL] vhost: cleanups and fixes
Date: Thu, 02 May 2013 11:55:29 -0700 [thread overview]
Message-ID: <1367520929.23900.114.camel@haakon3.risingtidesystems.com> (raw)
In-Reply-To: <20130502105353.GA24655@redhat.com>
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 <mst@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 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
next prev parent reply other threads:[~2013-05-02 18:55 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-02 10:53 [PULL] vhost: cleanups and fixes Michael S. Tsirkin
2013-05-02 18:55 ` Nicholas A. Bellinger [this message]
2013-05-02 19:33 ` Michael S. Tsirkin
2013-05-02 19:49 ` Linus Torvalds
2013-06-05 15:53 ` Michael S. Tsirkin
2013-07-08 11:45 Michael S. Tsirkin
2013-07-15 18:31 Michael S. Tsirkin
2013-07-22 8:07 ` Michael S. Tsirkin
2014-06-25 11:05 Michael S. Tsirkin
2014-11-13 21:22 Michael S. Tsirkin
2014-12-18 10:46 Michael S. Tsirkin
2015-01-01 12:26 Michael S. Tsirkin
2015-01-08 7:51 Michael S. Tsirkin
2015-06-01 19:18 Michael S. Tsirkin
2015-06-01 19:45 ` Michael S. Tsirkin
2015-07-15 10:50 Michael S. Tsirkin
2015-07-15 11:26 ` Michael S. Tsirkin
2015-07-28 10:00 Michael S. Tsirkin
2015-09-09 9:15 Michael S. Tsirkin
2015-09-18 10:42 Michael S. Tsirkin
2015-12-07 17:07 Michael S. Tsirkin
2015-12-21 7:58 Michael S. Tsirkin
2016-05-24 11:57 Michael S. Tsirkin
2017-01-23 15:05 Michael S. Tsirkin
2017-01-23 21:50 ` Linus Torvalds
2017-01-24 2:45 ` Michael S. Tsirkin
2017-02-03 21:43 Michael S. Tsirkin
2017-03-02 5:49 Michael S. Tsirkin
2017-04-10 21:36 Michael S. Tsirkin
2017-08-25 18:47 Michael S. Tsirkin
2017-12-04 13:25 Michael S. Tsirkin
2017-12-08 15:47 Michael S. Tsirkin
2018-06-11 16:23 Michael S. Tsirkin
2018-06-11 18:32 ` Linus Torvalds
2018-06-11 18:44 ` Linus Torvalds
2018-06-12 1:36 ` Michael S. Tsirkin
2018-06-12 1:59 ` Linus Torvalds
2018-06-12 11:05 ` Wei Wang
2018-06-14 15:01 ` Nitesh Narayan Lal
2018-06-15 3:53 ` Wei Wang
2018-06-12 1:57 ` Michael S. Tsirkin
2018-11-01 21:19 Michael S. Tsirkin
2018-11-01 21:44 ` Linus Torvalds
2018-11-01 23:00 ` Kees Cook
2018-11-01 23:06 ` Linus Torvalds
2018-11-01 23:55 ` Michael S. Tsirkin
2018-11-02 11:46 ` Mark Rutland
2018-11-02 13:04 ` Michael S. Tsirkin
2018-11-02 16:14 ` Linus Torvalds
2018-11-02 16:59 ` Michael S. Tsirkin
2018-11-02 17:10 ` Linus Torvalds
2018-11-02 17:15 ` Linus Torvalds
2018-11-02 19:01 ` Al Viro
2018-11-02 17:21 ` Michael S. Tsirkin
2018-11-02 18:02 ` Linus Torvalds
2018-11-02 18:12 ` Michael S. Tsirkin
2018-11-30 13:44 ` Michael S. Tsirkin
2018-11-30 19:01 ` Bijan Mottahedeh
2018-11-30 19:55 ` Michael S. Tsirkin
2018-11-01 23:38 ` Michael S. Tsirkin
2019-05-14 21:11 Michael S. Tsirkin
2019-05-14 21:20 ` pr-tracker-bot
2019-10-15 21:19 Michael S. Tsirkin
2019-10-15 22:25 ` pr-tracker-bot
[not found] <20200210010252-mutt-send-email-mst@kernel.org>
2020-02-11 2:07 ` Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1367520929.23900.114.camel@haakon3.risingtidesystems.com \
--to=nab@linux-iscsi.org \
--cc=asias@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=target-devel@vger.kernel.org \
--cc=virtualization@lists.osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).