mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-10-30 21:28:14 +00:00
130e546fcf
In 4.10.5 and 4.9.17 include a fix for the VMBus memory leak, cherry-picked from char-misc: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git/commit/?h=char-misc-linus&id=5e030d5ce9d99a899b648413139ff65bab12b038 This patch was tested with the 4.10.5 kernel and the Hyper-V Socket stress test. It was forwarded to stable@vger to be included in one of the next stable releases. Also remove the CPU ACCT revert as 17.03.1-rc1 is out and has a fix Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
29 lines
887 B
Diff
29 lines
887 B
Diff
From 8766952865ef882300fffdaf15b92c9f7d55b10b 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/44] 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 6b011c19b50f..1d57ed3d84d2 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.11.0
|
|
|