mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-12-07 20:04:56 +00:00
c41f680f7d
Series is at <1469716595-13591-1-git-send-email-stefanha@redhat.com>. This corresponds to v7 of the spec, posted in <1470324277-19300-1-git-send-email-stefanha@redhat.com> Also add a "cherry-picked from" to the "vsock: make listener child lock ordering explicit" patch and move it to the head of the series with the other vsock backports. Finally backport three new upstream fixes: 3fda5d6e5801 vhost/vsock: fix vhost virtio_vsock_pkt use-after-free 28ad55578b8a virtio-vsock: fix include guard typo 21bc54fc0cdc vhost/vsock: drop space available check for TX vq These were made on top of the version of the vsock patches which were added to Linux master in v4.8-rc1. This commit is based on the email posting, will replace with with proper cherry-pick separately. Requires corresponding backend changes in Hyperkit Signed-off-by: Ian Campbell <ian.campbell@docker.com>
29 lines
876 B
Diff
29 lines
876 B
Diff
From f829b4b9d6ef1fa1d2859f5eceb9001c772541c3 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Date: Fri, 5 Aug 2016 13:52:09 +0100
|
|
Subject: [PATCH 12/45] virtio-vsock: fix include guard typo
|
|
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
(cherry picked from commit 28ad55578b8a76390d966b09da8c7fa3644f5140)
|
|
---
|
|
include/uapi/linux/virtio_vsock.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/include/uapi/linux/virtio_vsock.h b/include/uapi/linux/virtio_vsock.h
|
|
index 6b011c1..1d57ed3 100644
|
|
--- a/include/uapi/linux/virtio_vsock.h
|
|
+++ b/include/uapi/linux/virtio_vsock.h
|
|
@@ -32,7 +32,7 @@
|
|
*/
|
|
|
|
#ifndef _UAPI_LINUX_VIRTIO_VSOCK_H
|
|
-#define _UAPI_LINUX_VIRTIO_VOSCK_H
|
|
+#define _UAPI_LINUX_VIRTIO_VSOCK_H
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/virtio_ids.h>
|
|
--
|
|
2.9.3
|
|
|