mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-27 12:38:11 +00:00
Merge pull request #761 from ijc25/kernel-patch-whitespace
Fixup kernel patch whitepace
This commit is contained in:
commit
9a4d135e8c
@ -1,4 +1,4 @@
|
|||||||
From 888876dd84da7cdcb7c2ce7568efb2a2adbc9031 Mon Sep 17 00:00:00 2001
|
From c05011868782b0fbad73702161492e953eacbcbf Mon Sep 17 00:00:00 2001
|
||||||
From: Ian Campbell <ian.campbell@docker.com>
|
From: Ian Campbell <ian.campbell@docker.com>
|
||||||
Date: Mon, 4 Apr 2016 14:50:10 +0100
|
Date: Mon, 4 Apr 2016 14:50:10 +0100
|
||||||
Subject: [PATCH 1/5] VSOCK: Only allow host network namespace to use AF_VSOCK.
|
Subject: [PATCH 1/5] VSOCK: Only allow host network namespace to use AF_VSOCK.
|
||||||
@ -26,4 +26,5 @@ index 8a398b3..0edc54c 100644
|
|||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
--
|
--
|
||||||
2.10.1
|
2.10.2
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 478faef05c2fd212054793b4f5fde3f7ad502e20 Mon Sep 17 00:00:00 2001
|
From 457218c0979bb7272eca5e3a6039161890d7dcb5 Mon Sep 17 00:00:00 2001
|
||||||
From: Dexuan Cui <decui@microsoft.com>
|
From: Dexuan Cui <decui@microsoft.com>
|
||||||
Date: Sat, 21 May 2016 16:55:50 +0800
|
Date: Sat, 21 May 2016 16:55:50 +0800
|
||||||
Subject: [PATCH 2/5] Drivers: hv: vmbus: fix the race when querying & updating
|
Subject: [PATCH 2/5] Drivers: hv: vmbus: fix the race when querying & updating
|
||||||
@ -129,4 +129,5 @@ index b6c1211..8f4e6070 100644
|
|||||||
err_free_chan:
|
err_free_chan:
|
||||||
free_channel(newchannel);
|
free_channel(newchannel);
|
||||||
--
|
--
|
||||||
2.10.1
|
2.10.2
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From ccd1d4920969d0dcba862dc98f9b4747a383bfe2 Mon Sep 17 00:00:00 2001
|
From f1b841ced482479a9ff9fb5dce29e47d563a1dba Mon Sep 17 00:00:00 2001
|
||||||
From: Dexuan Cui <decui@microsoft.com>
|
From: Dexuan Cui <decui@microsoft.com>
|
||||||
Date: Sat, 23 Jul 2016 01:35:51 +0000
|
Date: Sat, 23 Jul 2016 01:35:51 +0000
|
||||||
Subject: [PATCH 3/5] hv_sock: introduce Hyper-V Sockets
|
Subject: [PATCH 3/5] hv_sock: introduce Hyper-V Sockets
|
||||||
@ -30,12 +30,11 @@ Origin: https://patchwork.kernel.org/patch/9244467/
|
|||||||
include/linux/socket.h | 4 +-
|
include/linux/socket.h | 4 +-
|
||||||
include/net/af_hvsock.h | 78 +++
|
include/net/af_hvsock.h | 78 +++
|
||||||
include/uapi/linux/hyperv.h | 23 +
|
include/uapi/linux/hyperv.h | 23 +
|
||||||
net/Kconfig | 1 +
|
|
||||||
net/Makefile | 1 +
|
net/Makefile | 1 +
|
||||||
net/hv_sock/Kconfig | 10 +
|
net/hv_sock/Kconfig | 10 +
|
||||||
net/hv_sock/Makefile | 3 +
|
net/hv_sock/Makefile | 3 +
|
||||||
net/hv_sock/af_hvsock.c | 1507 +++++++++++++++++++++++++++++++++++++++++++
|
net/hv_sock/af_hvsock.c | 1507 +++++++++++++++++++++++++++++++++++++++++++
|
||||||
10 files changed, 1641 insertions(+), 1 deletion(-)
|
9 files changed, 1640 insertions(+), 1 deletion(-)
|
||||||
create mode 100644 include/net/af_hvsock.h
|
create mode 100644 include/net/af_hvsock.h
|
||||||
create mode 100644 net/hv_sock/Kconfig
|
create mode 100644 net/hv_sock/Kconfig
|
||||||
create mode 100644 net/hv_sock/Makefile
|
create mode 100644 net/hv_sock/Makefile
|
||||||
@ -224,18 +223,6 @@ index e347b24..eb3e44b 100644
|
|||||||
+#define SHV_PROTO_RAW 1
|
+#define SHV_PROTO_RAW 1
|
||||||
+
|
+
|
||||||
#endif /* _UAPI_HYPERV_H */
|
#endif /* _UAPI_HYPERV_H */
|
||||||
diff --git a/net/Kconfig b/net/Kconfig
|
|
||||||
index c2cdbce..921e86f 100644
|
|
||||||
--- a/net/Kconfig
|
|
||||||
+++ b/net/Kconfig
|
|
||||||
@@ -231,6 +231,7 @@ source "net/dns_resolver/Kconfig"
|
|
||||||
source "net/batman-adv/Kconfig"
|
|
||||||
source "net/openvswitch/Kconfig"
|
|
||||||
source "net/vmw_vsock/Kconfig"
|
|
||||||
+source "net/hv_sock/Kconfig"
|
|
||||||
source "net/netlink/Kconfig"
|
|
||||||
source "net/mpls/Kconfig"
|
|
||||||
source "net/hsr/Kconfig"
|
|
||||||
diff --git a/net/Makefile b/net/Makefile
|
diff --git a/net/Makefile b/net/Makefile
|
||||||
index 9bd20bb..b4d4e9a 100644
|
index 9bd20bb..b4d4e9a 100644
|
||||||
--- a/net/Makefile
|
--- a/net/Makefile
|
||||||
@ -1787,4 +1774,5 @@ index 0000000..331d375
|
|||||||
+MODULE_DESCRIPTION("Hyper-V Sockets");
|
+MODULE_DESCRIPTION("Hyper-V Sockets");
|
||||||
+MODULE_LICENSE("Dual BSD/GPL");
|
+MODULE_LICENSE("Dual BSD/GPL");
|
||||||
--
|
--
|
||||||
2.10.1
|
2.10.2
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 59f4c8c2b14753db30aea235624a7d5212a0c715 Mon Sep 17 00:00:00 2001
|
From 39ad80464832bca79a5ae1a0a2de87641ca0be13 Mon Sep 17 00:00:00 2001
|
||||||
From: Rolf Neugebauer <rolf.neugebauer@gmail.com>
|
From: Rolf Neugebauer <rolf.neugebauer@gmail.com>
|
||||||
Date: Mon, 23 May 2016 18:55:45 +0100
|
Date: Mon, 23 May 2016 18:55:45 +0100
|
||||||
Subject: [PATCH 4/5] vmbus: Don't spam the logs with unknown GUIDs
|
Subject: [PATCH 4/5] vmbus: Don't spam the logs with unknown GUIDs
|
||||||
@ -26,4 +26,5 @@ index 8f4e6070..ef4a512 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
--
|
--
|
||||||
2.10.1
|
2.10.2
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 56b20d9d99f039745e3b9e9fe8c4243e90d13334 Mon Sep 17 00:00:00 2001
|
From 3bcb5d6eddbc61f460aa17d6f2a226e0a0a0ed09 Mon Sep 17 00:00:00 2001
|
||||||
From: Eric Dumazet <edumazet@google.com>
|
From: Eric Dumazet <edumazet@google.com>
|
||||||
Date: Mon, 14 Nov 2016 16:28:42 -0800
|
Date: Mon, 14 Nov 2016 16:28:42 -0800
|
||||||
Subject: [PATCH 5/5] gro_cells: mark napi struct as not busy poll candidates
|
Subject: [PATCH 5/5] gro_cells: mark napi struct as not busy poll candidates
|
||||||
@ -46,4 +46,5 @@ index d15214d..2a1abbf 100644
|
|||||||
napi_enable(&cell->napi);
|
napi_enable(&cell->napi);
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.10.1
|
2.10.2
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user