mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-12-07 05:25:52 +00:00
81b86d111a
The vsock patches were merged into mainline in v4.8-rc1, replace the patches based on the email posting with cherry-picks. The patches appear identical so the only change here is to the annotation of the origin which now references an upstream commit instead of a message-id. Add one new upstream patch b226acab2f6a "VSOCK: Use kvfree()" Signed-off-by: Ian Campbell <ian.campbell@docker.com>
29 lines
876 B
Diff
29 lines
876 B
Diff
From 1a8274f5f22a79f10aae3b4cf35f9b8a65f7f423 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Date: Fri, 5 Aug 2016 13:52:09 +0100
|
|
Subject: [PATCH 13/46] 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
|
|
|