mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-21 01:59:07 +00:00
kernel: Update to 4.14.15/4.9.78/4.4.113
While at it, also update to latest alpine base Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
parent
fe6e4d85be
commit
5de66f4fd9
@ -1,4 +1,4 @@
|
|||||||
FROM linuxkit/alpine:34518265c6cb63ff02074549cc5b64bef40c336f AS kernel-build
|
FROM linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7 AS kernel-build
|
||||||
RUN apk add \
|
RUN apk add \
|
||||||
argp-standalone \
|
argp-standalone \
|
||||||
automake \
|
automake \
|
||||||
|
@ -204,11 +204,11 @@ endef
|
|||||||
# Build Targets
|
# Build Targets
|
||||||
# Debug targets only for latest stable and LTS stable
|
# Debug targets only for latest stable and LTS stable
|
||||||
#
|
#
|
||||||
$(eval $(call kernel,4.14.14,4.14.x,$(EXTRA)))
|
$(eval $(call kernel,4.14.15,4.14.x,$(EXTRA)))
|
||||||
$(eval $(call kernel,4.14.14,4.14.x,-dbg))
|
$(eval $(call kernel,4.14.15,4.14.x,-dbg))
|
||||||
$(eval $(call kernel,4.9.77,4.9.x,$(EXTRA)))
|
$(eval $(call kernel,4.9.78,4.9.x,$(EXTRA)))
|
||||||
$(eval $(call kernel,4.9.77,4.9.x,-dbg))
|
$(eval $(call kernel,4.9.78,4.9.x,-dbg))
|
||||||
$(eval $(call kernel,4.4.112,4.4.x,$(EXTRA)))
|
$(eval $(call kernel,4.4.113,4.4.x,$(EXTRA)))
|
||||||
|
|
||||||
# Target for kernel config
|
# Target for kernel config
|
||||||
kconfig: | sources
|
kconfig: | sources
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/arm64 4.14.14 Kernel Configuration
|
# Linux/arm64 4.14.15 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_ARM64=y
|
CONFIG_ARM64=y
|
||||||
CONFIG_64BIT=y
|
CONFIG_64BIT=y
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/x86 4.14.14 Kernel Configuration
|
# Linux/x86 4.14.15 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_64BIT=y
|
CONFIG_64BIT=y
|
||||||
CONFIG_X86_64=y
|
CONFIG_X86_64=y
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/arm64 4.4.112 Kernel Configuration
|
# Linux/arm64 4.4.113 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_ARM64=y
|
CONFIG_ARM64=y
|
||||||
CONFIG_64BIT=y
|
CONFIG_64BIT=y
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/x86 4.4.112 Kernel Configuration
|
# Linux/x86 4.4.113 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_64BIT=y
|
CONFIG_64BIT=y
|
||||||
CONFIG_X86_64=y
|
CONFIG_X86_64=y
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/arm64 4.9.77 Kernel Configuration
|
# Linux/arm64 4.9.78 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_ARM64=y
|
CONFIG_ARM64=y
|
||||||
CONFIG_64BIT=y
|
CONFIG_64BIT=y
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/x86 4.9.77 Kernel Configuration
|
# Linux/x86 4.9.78 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_64BIT=y
|
CONFIG_64BIT=y
|
||||||
CONFIG_X86_64=y
|
CONFIG_X86_64=y
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From b5c58c8c5f25526e051c68e5ce3f3ff6f6276c00 Mon Sep 17 00:00:00 2001
|
From 2852924b8f1df7aaa4fb53613f1f96470cff6b3c Mon Sep 17 00:00:00 2001
|
||||||
From: Cheng-mean Liu <soccerl@microsoft.com>
|
From: Cheng-mean Liu <soccerl@microsoft.com>
|
||||||
Date: Tue, 11 Jul 2017 16:58:26 -0700
|
Date: Tue, 11 Jul 2017 16:58:26 -0700
|
||||||
Subject: [PATCH] NVDIMM: reducded ND_MIN_NAMESPACE_SIZE from 4MB to 4KB (page
|
Subject: [PATCH] NVDIMM: reducded ND_MIN_NAMESPACE_SIZE from 4MB to 4KB (page
|
||||||
@ -24,5 +24,5 @@ index 3f03567631cb..e63c201ed1ef 100644
|
|||||||
|
|
||||||
enum ars_masks {
|
enum ars_masks {
|
||||||
--
|
--
|
||||||
2.15.0
|
2.16.0
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From b03fcf118aab45e91021a03fb071c6f8939a24d1 Mon Sep 17 00:00:00 2001
|
From 6609c1c5a06527da79adb9482d8a101bd2163970 Mon Sep 17 00:00:00 2001
|
||||||
From: Arnaldo Carvalho de Melo <acme@redhat.com>
|
From: Arnaldo Carvalho de Melo <acme@redhat.com>
|
||||||
Date: Thu, 2 Mar 2017 12:55:49 -0300
|
Date: Thu, 2 Mar 2017 12:55:49 -0300
|
||||||
Subject: [PATCH 01/12] tools build: Add test for sched_getcpu()
|
Subject: [PATCH 01/12] tools build: Add test for sched_getcpu()
|
||||||
@ -101,7 +101,7 @@ index 000000000000..c4a148dd7104
|
|||||||
+ return sched_getcpu();
|
+ return sched_getcpu();
|
||||||
+}
|
+}
|
||||||
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
|
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
|
||||||
index cffdd9cf3ebf..a33f737329ae 100644
|
index ff375310efe4..07c12686bcd1 100644
|
||||||
--- a/tools/perf/Makefile.config
|
--- a/tools/perf/Makefile.config
|
||||||
+++ b/tools/perf/Makefile.config
|
+++ b/tools/perf/Makefile.config
|
||||||
@@ -296,6 +296,10 @@ ifdef NO_DWARF
|
@@ -296,6 +296,10 @@ ifdef NO_DWARF
|
||||||
@ -146,5 +146,5 @@ index 43899e0d6fa1..c3b180254f91 100644
|
|||||||
|
|
||||||
int is_printable_array(char *p, unsigned int len);
|
int is_printable_array(char *p, unsigned int len);
|
||||||
--
|
--
|
||||||
2.15.0
|
2.16.0
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 86122e4fc58bb5d5a5ef6c02f4f7b44f9da85567 Mon Sep 17 00:00:00 2001
|
From 397070619f51946b18d198d7d44632bfbde0a0b0 Mon Sep 17 00:00:00 2001
|
||||||
From: Arnaldo Carvalho de Melo <acme@redhat.com>
|
From: Arnaldo Carvalho de Melo <acme@redhat.com>
|
||||||
Date: Thu, 13 Oct 2016 17:12:35 -0300
|
Date: Thu, 13 Oct 2016 17:12:35 -0300
|
||||||
Subject: [PATCH 02/12] perf jit: Avoid returning garbage for a ret variable
|
Subject: [PATCH 02/12] perf jit: Avoid returning garbage for a ret variable
|
||||||
@ -66,5 +66,5 @@ index 95f0884aae02..f3ed3c963c71 100644
|
|||||||
while ((jr = jit_get_next_entry(jd))) {
|
while ((jr = jit_get_next_entry(jd))) {
|
||||||
switch(jr->prefix.id) {
|
switch(jr->prefix.id) {
|
||||||
--
|
--
|
||||||
2.15.0
|
2.16.0
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 286dc60d9128405f97dc3010efca03c5b922fea6 Mon Sep 17 00:00:00 2001
|
From 01a2e1c99ca586e581130087e6a358b890bb53ae 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 03/12] hv_sock: introduce Hyper-V Sockets
|
Subject: [PATCH 03/12] hv_sock: introduce Hyper-V Sockets
|
||||||
@ -1787,5 +1787,5 @@ index 000000000000..331d3759f5cb
|
|||||||
+MODULE_DESCRIPTION("Hyper-V Sockets");
|
+MODULE_DESCRIPTION("Hyper-V Sockets");
|
||||||
+MODULE_LICENSE("Dual BSD/GPL");
|
+MODULE_LICENSE("Dual BSD/GPL");
|
||||||
--
|
--
|
||||||
2.15.0
|
2.16.0
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From f4bb84982184af590bccef2726ef04ffb28004e9 Mon Sep 17 00:00:00 2001
|
From fc283d9a29218bcaee2d646c2108374914ffec83 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 04/12] vmbus: Don't spam the logs with unknown GUIDs
|
Subject: [PATCH 04/12] vmbus: Don't spam the logs with unknown GUIDs
|
||||||
@ -26,5 +26,5 @@ index d8bc4b910192..8df02f3ca0b2 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
--
|
--
|
||||||
2.15.0
|
2.16.0
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From c032373698b1c82c222d834622391246bee9c88f Mon Sep 17 00:00:00 2001
|
From 8bee13f3df81631672b58e63faf32da0539ed232 Mon Sep 17 00:00:00 2001
|
||||||
From: Alex Ng <alexng@messages.microsoft.com>
|
From: Alex Ng <alexng@messages.microsoft.com>
|
||||||
Date: Sun, 6 Nov 2016 13:14:07 -0800
|
Date: Sun, 6 Nov 2016 13:14:07 -0800
|
||||||
Subject: [PATCH 05/12] Drivers: hv: utils: Fix the mapping between host
|
Subject: [PATCH 05/12] Drivers: hv: utils: Fix the mapping between host
|
||||||
@ -44,5 +44,5 @@ index bcd06306f3e8..e7707747f56d 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
--
|
--
|
||||||
2.15.0
|
2.16.0
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 491aa03c8f4aeb600116510f555f602ce0806c52 Mon Sep 17 00:00:00 2001
|
From ccc87ce9d6afd46e13c754252fc3ed266b8e8a80 Mon Sep 17 00:00:00 2001
|
||||||
From: Alex Ng <alexng@messages.microsoft.com>
|
From: Alex Ng <alexng@messages.microsoft.com>
|
||||||
Date: Sun, 6 Nov 2016 13:14:10 -0800
|
Date: Sun, 6 Nov 2016 13:14:10 -0800
|
||||||
Subject: [PATCH 06/12] Drivers: hv: vss: Improve log messages.
|
Subject: [PATCH 06/12] Drivers: hv: vss: Improve log messages.
|
||||||
@ -101,5 +101,5 @@ index a6707133c297..5c95ba1e2ecf 100644
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.15.0
|
2.16.0
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 35be9dd9c0e37268c8cefc6d467cdd4f73510376 Mon Sep 17 00:00:00 2001
|
From e66f1fe20c6151c9b11ea185145526d17307bd1d Mon Sep 17 00:00:00 2001
|
||||||
From: Alex Ng <alexng@messages.microsoft.com>
|
From: Alex Ng <alexng@messages.microsoft.com>
|
||||||
Date: Sun, 6 Nov 2016 13:14:11 -0800
|
Date: Sun, 6 Nov 2016 13:14:11 -0800
|
||||||
Subject: [PATCH 07/12] Drivers: hv: vss: Operation timeouts should match host
|
Subject: [PATCH 07/12] Drivers: hv: vss: Operation timeouts should match host
|
||||||
@ -44,5 +44,5 @@ index 5c95ba1e2ecf..eee238cc60bd 100644
|
|||||||
rc = hvutil_transport_send(hvt, vss_msg, sizeof(*vss_msg), NULL);
|
rc = hvutil_transport_send(hvt, vss_msg, sizeof(*vss_msg), NULL);
|
||||||
if (rc) {
|
if (rc) {
|
||||||
--
|
--
|
||||||
2.15.0
|
2.16.0
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From a48f7e87b9bfa8b2f099442f58da4eadf38c0bb5 Mon Sep 17 00:00:00 2001
|
From 027257ec33f2d3dc8c22369f66d7b06452d3e370 Mon Sep 17 00:00:00 2001
|
||||||
From: Alex Ng <alexng@messages.microsoft.com>
|
From: Alex Ng <alexng@messages.microsoft.com>
|
||||||
Date: Sat, 28 Jan 2017 12:37:17 -0700
|
Date: Sat, 28 Jan 2017 12:37:17 -0700
|
||||||
Subject: [PATCH 08/12] Drivers: hv: vmbus: Use all supported IC versions to
|
Subject: [PATCH 08/12] Drivers: hv: vmbus: Use all supported IC versions to
|
||||||
@ -488,5 +488,5 @@ index c9af8369b4f7..7df9eb8f0cf7 100644
|
|||||||
void hv_event_tasklet_disable(struct vmbus_channel *channel);
|
void hv_event_tasklet_disable(struct vmbus_channel *channel);
|
||||||
void hv_event_tasklet_enable(struct vmbus_channel *channel);
|
void hv_event_tasklet_enable(struct vmbus_channel *channel);
|
||||||
--
|
--
|
||||||
2.15.0
|
2.16.0
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 5d6dff7e1ba1cb9bd6be860fe271b6cbd26cc541 Mon Sep 17 00:00:00 2001
|
From b16f9d200445f5a61d2ea1b14a753d7b39a59db3 Mon Sep 17 00:00:00 2001
|
||||||
From: Alex Ng <alexng@messages.microsoft.com>
|
From: Alex Ng <alexng@messages.microsoft.com>
|
||||||
Date: Sat, 28 Jan 2017 12:37:18 -0700
|
Date: Sat, 28 Jan 2017 12:37:18 -0700
|
||||||
Subject: [PATCH 09/12] Drivers: hv: Log the negotiated IC versions.
|
Subject: [PATCH 09/12] Drivers: hv: Log the negotiated IC versions.
|
||||||
@ -114,5 +114,5 @@ index f3797c07be10..89440c2eb346 100644
|
|||||||
hb_srv_version & 0xFFFF);
|
hb_srv_version & 0xFFFF);
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.15.0
|
2.16.0
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 9a6d80864973aa8ab5ab624c7762672dcd36120e Mon Sep 17 00:00:00 2001
|
From 323f44a4ac5368faeb471232e07bb51f4701e9da Mon Sep 17 00:00:00 2001
|
||||||
From: Dexuan Cui <decui@microsoft.com>
|
From: Dexuan Cui <decui@microsoft.com>
|
||||||
Date: Sun, 26 Mar 2017 16:42:20 +0800
|
Date: Sun, 26 Mar 2017 16:42:20 +0800
|
||||||
Subject: [PATCH 10/12] vmbus: fix missed ring events on boot
|
Subject: [PATCH 10/12] vmbus: fix missed ring events on boot
|
||||||
@ -52,5 +52,5 @@ index e7949b64bfbc..2fe024e86209 100644
|
|||||||
|
|
||||||
void hv_process_channel_removal(struct vmbus_channel *channel, u32 relid)
|
void hv_process_channel_removal(struct vmbus_channel *channel, u32 relid)
|
||||||
--
|
--
|
||||||
2.15.0
|
2.16.0
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 1a9b56e241b1336b16dac226c95619e084dba59c Mon Sep 17 00:00:00 2001
|
From 17755d00ce960b93bc31878c33fd2570a095a2ac Mon Sep 17 00:00:00 2001
|
||||||
From: Dexuan Cui <decui@microsoft.com>
|
From: Dexuan Cui <decui@microsoft.com>
|
||||||
Date: Wed, 29 Mar 2017 18:37:10 +0800
|
Date: Wed, 29 Mar 2017 18:37:10 +0800
|
||||||
Subject: [PATCH 11/12] vmbus: remove "goto error_clean_msglist" in
|
Subject: [PATCH 11/12] vmbus: remove "goto error_clean_msglist" in
|
||||||
@ -56,5 +56,5 @@ index 1606e7f08f4b..1caed01954f6 100644
|
|||||||
vmbus_teardown_gpadl(newchannel, newchannel->ringbuffer_gpadlhandle);
|
vmbus_teardown_gpadl(newchannel, newchannel->ringbuffer_gpadlhandle);
|
||||||
kfree(open_info);
|
kfree(open_info);
|
||||||
--
|
--
|
||||||
2.15.0
|
2.16.0
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From d10159f1f7fb52fe94ade688f60688f11328c03e Mon Sep 17 00:00:00 2001
|
From 7116d27c8966baf90e9acd71aad8e783d6dc1e97 Mon Sep 17 00:00:00 2001
|
||||||
From: Dexuan Cui <decui@microsoft.com>
|
From: Dexuan Cui <decui@microsoft.com>
|
||||||
Date: Fri, 24 Mar 2017 20:53:18 +0800
|
Date: Fri, 24 Mar 2017 20:53:18 +0800
|
||||||
Subject: [PATCH 12/12] vmbus: dynamically enqueue/dequeue the channel on
|
Subject: [PATCH 12/12] vmbus: dynamically enqueue/dequeue the channel on
|
||||||
@ -173,5 +173,5 @@ index 7df9eb8f0cf7..a87757cf277b 100644
|
|||||||
|
|
||||||
void vmbus_setevent(struct vmbus_channel *channel);
|
void vmbus_setevent(struct vmbus_channel *channel);
|
||||||
--
|
--
|
||||||
2.15.0
|
2.16.0
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user