From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Jul 2013 21:48:50 +0000 (-0700)
Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
X-Git-Tag: v4.0~3697
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d10aae2741ec9ffd53c8d214f7ada6d543b3a46;p=platform%2Fkernel%2Flinux-amlogic.git

Merge tag 'for_linus' of git://git./linux/kernel/git/mst/vhost

Pull vhost fixes and cleanups from Michael S Tsirkin:
 "This includes some fixes and cleanups for vhost net and scsi drivers"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost/test: update test after vhost cleanups
  vhost: Make local function static
  vhost: Make vhost a separate module
  vhost-scsi: Rename struct tcm_vhost_cmd *tv_cmd to *cmd
  vhost-scsi: Rename struct tcm_vhost_tpg *tv_tpg to *tpg
  vhost-scsi: Make func indention more consistent
  vhost-scsi: Rename struct vhost_scsi *s to *vs
  vhost-scsi: Remove unnecessary forward struct vhost_scsi declaration
  vhost: Simplify dev->vqs[i] access
  vhost-net: fix use-after-free in vhost_net_flush
---

8d10aae2741ec9ffd53c8d214f7ada6d543b3a46