drop 4.4 vhost patch that never applied and ended up at the bottom of the stack

diff --git a/queue-4.4/series b/queue-4.4/series
index 4dc01e373b37c7d7387f57b174481df24527efc5..1ffe9e77f2a1b783be222e877f7eeba05d620f4a 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -85,4 +85,3 @@ ceph-don-t-update-importing-cap-s-mseq-when-handing-cap-export.patch
 genwqe-fix-size-check.patch
 intel_th-msu-fix-an-off-by-one-in-attribute-store.patch
 power-supply-olpc_battery-correct-the-temperature-units.patch
-vhost-vsock-fix-uninitialized-vhost_vsock-guest_cid.patch

diff --git a/queue-4.4/vhost-vsock-fix-uninitialized-vhost_vsock-guest_cid.patch b/queue-4.4/vhost-vsock-fix-uninitialized-vhost_vsock-guest_cid.patch
deleted file mode 100644 (file)
index db5444c..0000000
--- a/queue-4.4/vhost-vsock-fix-uninitialized-vhost_vsock-guest_cid.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a72b69dc083a931422cc8a5e33841aff7d5312f2 Mon Sep 17 00:00:00 2001
-From: Stefan Hajnoczi <stefanha@redhat.com>
-Date: Thu, 9 Nov 2017 13:29:10 +0000
-Subject: vhost/vsock: fix uninitialized vhost_vsock->guest_cid
-
-From: Stefan Hajnoczi <stefanha@redhat.com>
-
-commit a72b69dc083a931422cc8a5e33841aff7d5312f2 upstream.
-
-The vhost_vsock->guest_cid field is uninitialized when /dev/vhost-vsock
-is opened until the VHOST_VSOCK_SET_GUEST_CID ioctl is called.
-
-kvmalloc(..., GFP_KERNEL | __GFP_RETRY_MAYFAIL) does not zero memory.
-All other vhost_vsock fields are initialized explicitly so just
-initialize this field too.
-
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-Cc: Daniel Verkamp <dverkamp@chromium.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
-index c9de9c41aa97..5a5e981bd8e4 100644
---- a/drivers/vhost/vsock.c
-+++ b/drivers/vhost/vsock.c
-@@ -518,6 +518,8 @@ static int vhost_vsock_dev_open(struct inode *inode, struct file *file)
-               goto out;
-       }
- 
-+      vsock->guest_cid = 0; /* no CID assigned yet */
-+
-       atomic_set(&vsock->queued_replies, 0);
- 
-       vqs[VSOCK_VQ_TX] = &vsock->vqs[VSOCK_VQ_TX];