diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index 36be49797..974150d3f 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -1,6 +1,6 @@ # This is a blueprint for building the open source components of Docker for Mac kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/vpnkit-expose-port:728e5fe9e6b818d9825b28826b929ae75a386e9e # install vpnkit-expose-port and vpnkit-iptables-wrapper on host diff --git a/examples/aws.yml b/examples/aws.yml index 272570fef..badd85fce 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/examples/azure.yml b/examples/azure.yml index 679207188..a266e13ce 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 8ea1338a8..5171bccb3 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/examples/docker.yml b/examples/docker.yml index e4e8d9a93..ea82a633c 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/examples/gcp.yml b/examples/gcp.yml index 0d946dba3..475a06f6a 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/examples/getty.yml b/examples/getty.yml index b25bd312c..84d59fda6 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/examples/minimal.yml b/examples/minimal.yml index 6fd74983d..60c9b5536 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 1278f1e0d..eb4b113e4 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/examples/openstack.yml b/examples/openstack.yml index f17c546ea..2c456bab6 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/examples/packet.yml b/examples/packet.yml index 16e49ae78..97e91a61b 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS1 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 55ff7d562..4a89bee95 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -1,7 +1,7 @@ # Minimal YAML to run a redis server (used at DockerCon'17) # connect: nc localhost 6379 kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/examples/sshd.yml b/examples/sshd.yml index 4d228f80a..4c758080b 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/examples/swap.yml b/examples/swap.yml index 27e180b49..fb27cc650 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/examples/vmware.yml b/examples/vmware.yml index 4c4a0b7e1..a70d02d29 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=tty0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 273058b4f..1097e0e94 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/examples/vsudd.yml b/examples/vsudd.yml index 406a9f3e6..d32935053 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/examples/vultr.yml b/examples/vultr.yml index 0d946dba3..475a06f6a 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/examples/wireguard.yml b/examples/wireguard.yml index bd9b9aae0..3b47e9d63 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/kernel/Makefile b/kernel/Makefile index 94ab615e3..f6d3cbc4f 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -204,11 +204,11 @@ endef # Build Targets # Debug targets only for latest stable and LTS stable # -$(eval $(call kernel,4.14.7,4.14.x,$(EXTRA))) -$(eval $(call kernel,4.14.7,4.14.x,-dbg)) -$(eval $(call kernel,4.9.70,4.9.x,$(EXTRA))) -$(eval $(call kernel,4.9.70,4.9.x,-dbg)) -$(eval $(call kernel,4.4.106,4.4.x,$(EXTRA))) +$(eval $(call kernel,4.14.9,4.14.x,$(EXTRA))) +$(eval $(call kernel,4.14.9,4.14.x,-dbg)) +$(eval $(call kernel,4.9.72,4.9.x,$(EXTRA))) +$(eval $(call kernel,4.9.72,4.9.x,-dbg)) +$(eval $(call kernel,4.4.108,4.4.x,$(EXTRA))) # Target for kernel config kconfig: | sources diff --git a/kernel/config-4.14.x-aarch64 b/kernel/config-4.14.x-aarch64 index e1aacdadd..4ce5d9681 100644 --- a/kernel/config-4.14.x-aarch64 +++ b/kernel/config-4.14.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.7 Kernel Configuration +# Linux/arm64 4.14.9 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/kernel/config-4.14.x-x86_64 b/kernel/config-4.14.x-x86_64 index 43a668395..3bbd775a3 100644 --- a/kernel/config-4.14.x-x86_64 +++ b/kernel/config-4.14.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.7 Kernel Configuration +# Linux/x86 4.14.9 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -3838,9 +3838,9 @@ CONFIG_OPTIMIZE_INLINING=y # CONFIG_DEBUG_NMI_SELFTEST is not set CONFIG_X86_DEBUG_FPU=y # CONFIG_PUNIT_ATOM_DEBUG is not set -# CONFIG_FRAME_POINTER_UNWINDER is not set -CONFIG_ORC_UNWINDER=y -# CONFIG_GUESS_UNWINDER is not set +CONFIG_UNWINDER_ORC=y +# CONFIG_UNWINDER_FRAME_POINTER is not set +# CONFIG_UNWINDER_GUESS is not set # # Security options diff --git a/kernel/config-4.4.x-aarch64 b/kernel/config-4.4.x-aarch64 index 117ea5796..aeb62d3fe 100644 --- a/kernel/config-4.4.x-aarch64 +++ b/kernel/config-4.4.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.4.106 Kernel Configuration +# Linux/arm64 4.4.108 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/kernel/config-4.4.x-x86_64 b/kernel/config-4.4.x-x86_64 index b5d563f08..5403fda50 100644 --- a/kernel/config-4.4.x-x86_64 +++ b/kernel/config-4.4.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.106 Kernel Configuration +# Linux/x86 4.4.108 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/config-4.9.x-aarch64 b/kernel/config-4.9.x-aarch64 index f442fe8fb..a8c0f5388 100644 --- a/kernel/config-4.9.x-aarch64 +++ b/kernel/config-4.9.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.9.70 Kernel Configuration +# Linux/arm64 4.9.72 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/kernel/config-4.9.x-x86_64 b/kernel/config-4.9.x-x86_64 index 8a6f9ea33..565f84317 100644 --- a/kernel/config-4.9.x-x86_64 +++ b/kernel/config-4.9.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.9.70 Kernel Configuration +# Linux/x86 4.9.72 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch b/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch index ae5741f46..30de13a20 100644 --- a/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch +++ b/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch @@ -1,4 +1,4 @@ -From 6609bcceff41b236a7bac382f31c32b722c861b4 Mon Sep 17 00:00:00 2001 +From c0606d168ec1c9af31627e3ea015e599e457c6af Mon Sep 17 00:00:00 2001 From: Cheng-mean Liu Date: Tue, 11 Jul 2017 16:58:26 -0700 Subject: [PATCH] NVDIMM: reducded ND_MIN_NAMESPACE_SIZE from 4MB to 4KB (page diff --git a/kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch b/kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch index d43ec93c6..5d5681bfd 100644 --- a/kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch +++ b/kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch @@ -1,4 +1,4 @@ -From 83cc3adf460a9bbea17baa9e6c495988a84034ad Mon Sep 17 00:00:00 2001 +From c9dbe016fbccd96b06cc1c2f3dd770d48f83e74f Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Thu, 2 Mar 2017 12:55:49 -0300 Subject: [PATCH 01/12] tools build: Add test for sched_getcpu() diff --git a/kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch b/kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch index 47e75f52b..54a3b1f32 100644 --- a/kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch +++ b/kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch @@ -1,4 +1,4 @@ -From 0021c8fb28a83fa4c61f30b4ef22358f2effbed6 Mon Sep 17 00:00:00 2001 +From 510d61e38ddcce25c536d0a370f5d48febfee999 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Thu, 13 Oct 2016 17:12:35 -0300 Subject: [PATCH 02/12] perf jit: Avoid returning garbage for a ret variable diff --git a/kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch b/kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch index 5c2e4dca3..3e05d3918 100644 --- a/kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch +++ b/kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch @@ -1,4 +1,4 @@ -From efea47108405d3a80ccb22c15a10a1a0bbbd51e5 Mon Sep 17 00:00:00 2001 +From fdcb520874a732fb3e3cf687d4b3ac4e7e1d8d14 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Sat, 23 Jul 2016 01:35:51 +0000 Subject: [PATCH 03/12] hv_sock: introduce Hyper-V Sockets diff --git a/kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch b/kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch index b171a9c99..6c552cc38 100644 --- a/kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch +++ b/kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch @@ -1,4 +1,4 @@ -From a7d3eb77302c36c84f9a23372e27752830120414 Mon Sep 17 00:00:00 2001 +From c20ae25050f32ebd0a03498154597a1410d16b30 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 23 May 2016 18:55:45 +0100 Subject: [PATCH 04/12] vmbus: Don't spam the logs with unknown GUIDs diff --git a/kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch b/kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch index 026a7976d..52fb0aab0 100644 --- a/kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch +++ b/kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch @@ -1,4 +1,4 @@ -From 67c0eb9c20e98f633fb7ae12b46fcef8256a2483 Mon Sep 17 00:00:00 2001 +From 1d82474b814b0ce7d784dfdd75798a8e058ce06a Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:07 -0800 Subject: [PATCH 05/12] Drivers: hv: utils: Fix the mapping between host diff --git a/kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch b/kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch index 7404d6c9a..c1cfc8211 100644 --- a/kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch +++ b/kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch @@ -1,4 +1,4 @@ -From 596d4b9ad2b8a1a14de8dd71b11c30fb9ee476b6 Mon Sep 17 00:00:00 2001 +From 6403a3c97ce40d1ad9e3107a54378399f077b1eb Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:10 -0800 Subject: [PATCH 06/12] Drivers: hv: vss: Improve log messages. @@ -16,10 +16,10 @@ Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/drivers/hv/hv_snapshot.c b/drivers/hv/hv_snapshot.c -index a76e3db0d01f..b1446d51ef45 100644 +index a6707133c297..5c95ba1e2ecf 100644 --- a/drivers/hv/hv_snapshot.c +++ b/drivers/hv/hv_snapshot.c -@@ -121,7 +121,7 @@ static int vss_handle_handshake(struct hv_vss_msg *vss_msg) +@@ -120,7 +120,7 @@ static int vss_handle_handshake(struct hv_vss_msg *vss_msg) default: return -EINVAL; } @@ -28,7 +28,7 @@ index a76e3db0d01f..b1446d51ef45 100644 return 0; } -@@ -129,8 +129,10 @@ static int vss_on_msg(void *msg, int len) +@@ -128,8 +128,10 @@ static int vss_on_msg(void *msg, int len) { struct hv_vss_msg *vss_msg = (struct hv_vss_msg *)msg; @@ -40,7 +40,7 @@ index a76e3db0d01f..b1446d51ef45 100644 if (vss_msg->vss_hdr.operation == VSS_OP_REGISTER || vss_msg->vss_hdr.operation == VSS_OP_REGISTER1) { -@@ -138,8 +140,11 @@ static int vss_on_msg(void *msg, int len) +@@ -137,8 +139,11 @@ static int vss_on_msg(void *msg, int len) * Don't process registration messages if we're in the middle * of a transaction processing. */ @@ -53,7 +53,7 @@ index a76e3db0d01f..b1446d51ef45 100644 return vss_handle_handshake(vss_msg); } else if (vss_transaction.state == HVUTIL_USERSPACE_REQ) { vss_transaction.state = HVUTIL_USERSPACE_RECV; -@@ -156,7 +161,7 @@ static int vss_on_msg(void *msg, int len) +@@ -155,7 +160,7 @@ static int vss_on_msg(void *msg, int len) } } else { /* This is a spurious call! */ @@ -62,7 +62,7 @@ index a76e3db0d01f..b1446d51ef45 100644 return -EINVAL; } return 0; -@@ -169,8 +174,10 @@ static void vss_send_op(void) +@@ -168,8 +173,10 @@ static void vss_send_op(void) struct hv_vss_msg *vss_msg; /* The transaction state is wrong. */ @@ -74,7 +74,7 @@ index a76e3db0d01f..b1446d51ef45 100644 vss_msg = kzalloc(sizeof(*vss_msg), GFP_KERNEL); if (!vss_msg) -@@ -211,9 +218,13 @@ static void vss_handle_request(struct work_struct *dummy) +@@ -210,9 +217,13 @@ static void vss_handle_request(struct work_struct *dummy) case VSS_OP_HOT_BACKUP: if (vss_transaction.state < HVUTIL_READY) { /* Userspace is not registered yet */ @@ -88,7 +88,7 @@ index a76e3db0d01f..b1446d51ef45 100644 vss_transaction.state = HVUTIL_HOSTMSG_RECEIVED; vss_send_op(); return; -@@ -356,8 +367,10 @@ hv_vss_init(struct hv_util_service *srv) +@@ -353,8 +364,10 @@ hv_vss_init(struct hv_util_service *srv) hvt = hvutil_transport_init(vss_devname, CN_VSS_IDX, CN_VSS_VAL, vss_on_msg, vss_on_reset); diff --git a/kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch b/kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch index 4f8686446..40b122574 100644 --- a/kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch +++ b/kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch @@ -1,4 +1,4 @@ -From 2cfda6eac2e1597529c8047ddc81b2f9acb8521d Mon Sep 17 00:00:00 2001 +From b67551aab501656028b900a77e246463a2fee988 Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sun, 6 Nov 2016 13:14:11 -0800 Subject: [PATCH 07/12] Drivers: hv: vss: Operation timeouts should match host @@ -18,7 +18,7 @@ Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/hv/hv_snapshot.c b/drivers/hv/hv_snapshot.c -index b1446d51ef45..4e543dbb731a 100644 +index 5c95ba1e2ecf..eee238cc60bd 100644 --- a/drivers/hv/hv_snapshot.c +++ b/drivers/hv/hv_snapshot.c @@ -31,7 +31,10 @@ @@ -33,7 +33,7 @@ index b1446d51ef45..4e543dbb731a 100644 /* * Global state maintained for transaction that is being processed. For a class -@@ -187,7 +190,8 @@ static void vss_send_op(void) +@@ -186,7 +189,8 @@ static void vss_send_op(void) vss_transaction.state = HVUTIL_USERSPACE_REQ; diff --git a/kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch b/kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch index d8536362b..d3f6c0da0 100644 --- a/kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch +++ b/kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch @@ -1,4 +1,4 @@ -From ce256433a38cddf67f26bb0003bf2508b519388a Mon Sep 17 00:00:00 2001 +From 60de5664e76c4e7fe593c9a9386c776be101899b Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sat, 28 Jan 2017 12:37:17 -0700 Subject: [PATCH 08/12] Drivers: hv: vmbus: Use all supported IC versions to @@ -162,7 +162,7 @@ index 8df02f3ca0b2..e7949b64bfbc 100644 negop->icversion_data[0].minor = icframe_minor; negop->icversion_data[1].major = icmsg_major; diff --git a/drivers/hv/hv_fcopy.c b/drivers/hv/hv_fcopy.c -index 75126e4e3f05..0713c6aaa33a 100644 +index 44420073edda..f1e0d0358206 100644 --- a/drivers/hv/hv_fcopy.c +++ b/drivers/hv/hv_fcopy.c @@ -31,6 +31,16 @@ @@ -182,7 +182,7 @@ index 75126e4e3f05..0713c6aaa33a 100644 /* * Global state maintained for transaction that is being processed. * For a class of integration services, including the "file copy service", -@@ -232,8 +242,6 @@ void hv_fcopy_onchannelcallback(void *context) +@@ -231,8 +241,6 @@ void hv_fcopy_onchannelcallback(void *context) u64 requestid; struct hv_fcopy_hdr *fcopy_msg; struct icmsg_hdr *icmsghdr; @@ -191,7 +191,7 @@ index 75126e4e3f05..0713c6aaa33a 100644 int fcopy_srv_version; if (fcopy_transaction.state > HVUTIL_READY) -@@ -247,10 +255,10 @@ void hv_fcopy_onchannelcallback(void *context) +@@ -246,10 +254,10 @@ void hv_fcopy_onchannelcallback(void *context) icmsghdr = (struct icmsg_hdr *)&recv_buffer[ sizeof(struct vmbuspipe_hdr)]; if (icmsghdr->icmsgtype == ICMSGTYPE_NEGOTIATE) { @@ -207,7 +207,7 @@ index 75126e4e3f05..0713c6aaa33a 100644 fcopy_msg = (struct hv_fcopy_hdr *)&recv_buffer[ sizeof(struct vmbuspipe_hdr) + diff --git a/drivers/hv/hv_kvp.c b/drivers/hv/hv_kvp.c -index 3abfc5983c97..2cc670442f6c 100644 +index 5e1fdc8d32ab..70c28b8806de 100644 --- a/drivers/hv/hv_kvp.c +++ b/drivers/hv/hv_kvp.c @@ -46,6 +46,19 @@ @@ -230,7 +230,7 @@ index 3abfc5983c97..2cc670442f6c 100644 /* * Global state maintained for transaction that is being processed. For a class * of integration services, including the "KVP service", the specified protocol -@@ -610,8 +623,6 @@ void hv_kvp_onchannelcallback(void *context) +@@ -609,8 +622,6 @@ void hv_kvp_onchannelcallback(void *context) struct hv_kvp_msg *kvp_msg; struct icmsg_hdr *icmsghdrp; @@ -239,7 +239,7 @@ index 3abfc5983c97..2cc670442f6c 100644 int kvp_srv_version; static enum {NEGO_NOT_STARTED, NEGO_IN_PROGRESS, -@@ -640,28 +651,10 @@ void hv_kvp_onchannelcallback(void *context) +@@ -639,28 +650,10 @@ void hv_kvp_onchannelcallback(void *context) sizeof(struct vmbuspipe_hdr)]; if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { @@ -273,7 +273,7 @@ index 3abfc5983c97..2cc670442f6c 100644 kvp_msg = (struct hv_kvp_msg *)&recv_buffer[ sizeof(struct vmbuspipe_hdr) + diff --git a/drivers/hv/hv_snapshot.c b/drivers/hv/hv_snapshot.c -index 4e543dbb731a..d14f10b924a0 100644 +index eee238cc60bd..8e62bf7f6265 100644 --- a/drivers/hv/hv_snapshot.c +++ b/drivers/hv/hv_snapshot.c @@ -31,6 +31,16 @@ @@ -293,7 +293,7 @@ index 4e543dbb731a..d14f10b924a0 100644 /* * Timeout values are based on expecations from host */ -@@ -297,7 +307,6 @@ void hv_vss_onchannelcallback(void *context) +@@ -296,7 +306,6 @@ void hv_vss_onchannelcallback(void *context) struct icmsg_hdr *icmsghdrp; @@ -301,7 +301,7 @@ index 4e543dbb731a..d14f10b924a0 100644 if (vss_transaction.state > HVUTIL_READY) return; -@@ -310,9 +319,10 @@ void hv_vss_onchannelcallback(void *context) +@@ -309,9 +318,10 @@ void hv_vss_onchannelcallback(void *context) sizeof(struct vmbuspipe_hdr)]; if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { diff --git a/kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch b/kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch index fe7264323..6433ab1ca 100644 --- a/kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch +++ b/kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch @@ -1,4 +1,4 @@ -From 919ed3a9c042a7fd014110aa6ec9b0b4dfedb749 Mon Sep 17 00:00:00 2001 +From e72a9a9a2a09598a7af546942e91f366677da501 Mon Sep 17 00:00:00 2001 From: Alex Ng Date: Sat, 28 Jan 2017 12:37:18 -0700 Subject: [PATCH 09/12] Drivers: hv: Log the negotiated IC versions. @@ -18,10 +18,10 @@ Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/drivers/hv/hv_fcopy.c b/drivers/hv/hv_fcopy.c -index 0713c6aaa33a..94f4f090ceea 100644 +index f1e0d0358206..e0ce0753c568 100644 --- a/drivers/hv/hv_fcopy.c +++ b/drivers/hv/hv_fcopy.c -@@ -255,10 +255,15 @@ void hv_fcopy_onchannelcallback(void *context) +@@ -254,10 +254,15 @@ void hv_fcopy_onchannelcallback(void *context) icmsghdr = (struct icmsg_hdr *)&recv_buffer[ sizeof(struct vmbuspipe_hdr)]; if (icmsghdr->icmsgtype == ICMSGTYPE_NEGOTIATE) { @@ -40,10 +40,10 @@ index 0713c6aaa33a..94f4f090ceea 100644 fcopy_msg = (struct hv_fcopy_hdr *)&recv_buffer[ sizeof(struct vmbuspipe_hdr) + diff --git a/drivers/hv/hv_kvp.c b/drivers/hv/hv_kvp.c -index 2cc670442f6c..de263712e247 100644 +index 70c28b8806de..a1adfe2cfb34 100644 --- a/drivers/hv/hv_kvp.c +++ b/drivers/hv/hv_kvp.c -@@ -651,10 +651,14 @@ void hv_kvp_onchannelcallback(void *context) +@@ -650,10 +650,14 @@ void hv_kvp_onchannelcallback(void *context) sizeof(struct vmbuspipe_hdr)]; if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { @@ -61,10 +61,10 @@ index 2cc670442f6c..de263712e247 100644 kvp_msg = (struct hv_kvp_msg *)&recv_buffer[ sizeof(struct vmbuspipe_hdr) + diff --git a/drivers/hv/hv_snapshot.c b/drivers/hv/hv_snapshot.c -index d14f10b924a0..bcc03f0748d6 100644 +index 8e62bf7f6265..e659d1b94a57 100644 --- a/drivers/hv/hv_snapshot.c +++ b/drivers/hv/hv_snapshot.c -@@ -304,7 +304,7 @@ void hv_vss_onchannelcallback(void *context) +@@ -303,7 +303,7 @@ void hv_vss_onchannelcallback(void *context) u32 recvlen; u64 requestid; struct hv_vss_msg *vss_msg; @@ -73,7 +73,7 @@ index d14f10b924a0..bcc03f0748d6 100644 struct icmsg_hdr *icmsghdrp; -@@ -319,10 +319,15 @@ void hv_vss_onchannelcallback(void *context) +@@ -318,10 +318,15 @@ void hv_vss_onchannelcallback(void *context) sizeof(struct vmbuspipe_hdr)]; if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { diff --git a/kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch b/kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch index a56a47309..e063f96d6 100644 --- a/kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch +++ b/kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch @@ -1,4 +1,4 @@ -From ecd9adcba4da55f85247cd1ca6507e4f4786eb34 Mon Sep 17 00:00:00 2001 +From b2e2592e5af9bcee08fb1ddec220d18706f22e17 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Sun, 26 Mar 2017 16:42:20 +0800 Subject: [PATCH 10/12] vmbus: fix missed ring events on boot diff --git a/kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch b/kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch index ad090cba8..e90a26792 100644 --- a/kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch +++ b/kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch @@ -1,4 +1,4 @@ -From 25dc167a82ccf312e6b3bac682637acefc53262f Mon Sep 17 00:00:00 2001 +From 35493074be67fc0761e9120834e55729a119dec3 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 29 Mar 2017 18:37:10 +0800 Subject: [PATCH 11/12] vmbus: remove "goto error_clean_msglist" in diff --git a/kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch b/kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch index bb57c3b52..2fdd3ce9f 100644 --- a/kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch +++ b/kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch @@ -1,4 +1,4 @@ -From 283bd035d158afe9b99d7842c4f9e42e026c19eb Mon Sep 17 00:00:00 2001 +From 397d94fb251c1a5fad29f5f018b3aa26fa0753d6 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 24 Mar 2017 20:53:18 +0800 Subject: [PATCH 12/12] vmbus: dynamically enqueue/dequeue the channel on diff --git a/linuxkit.yml b/linuxkit.yml index c733487fe..6610f3fe4 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 3e224996e..3c828e2de 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 47af3ec42..c91fb9fc4 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index 03ab5f023..363380360 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index 75c99b9a8..840c80277 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 # with runc, logwrite, startmemlogd diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index ae912737c..9536380bc 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 5703d62ef..2b0302b85 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index 492fa5a14..97e1cb14c 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml index de9eb8a1a..7e4138d2f 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index a6f5fc894..08e64f0d3 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index 9c3bd082c..5a71f670e 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml index 9c3bd082c..5a71f670e 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml index 9c3bd082c..5a71f670e 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml index 9c3bd082c..5a71f670e 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index 1e42684b4..7154d7613 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml index 9c3bd082c..5a71f670e 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml index f562bb684..9283de271 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/020_kernel/000_config_4.4.x/test.yml b/test/cases/020_kernel/000_config_4.4.x/test.yml index 369f7353a..2c40f8e8c 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.4.106 + image: linuxkit/kernel:4.4.108 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/020_kernel/001_config_4.9.x/test.yml b/test/cases/020_kernel/001_config_4.9.x/test.yml index 6981ae81d..c588e95b2 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/020_kernel/006_config_4.14.x/test.yml b/test/cases/020_kernel/006_config_4.14.x/test.yml index 8c762b87e..676ae1c5e 100644 --- a/test/cases/020_kernel/006_config_4.14.x/test.yml +++ b/test/cases/020_kernel/006_config_4.14.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.14.7 + image: linuxkit/kernel:4.14.9 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile b/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile index 8490f0963..2b2bde053 100644 --- a/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile +++ b/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile @@ -3,7 +3,7 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:4.4.106 AS ksrc +FROM linuxkit/kernel:4.4.108 AS ksrc # Extract headers and compile module FROM linuxkit/alpine:d307c8a386fa3f32cddda9409b9687e191cdd6f1 AS build diff --git a/test/cases/020_kernel/010_kmod_4.4.x/test.sh b/test/cases/020_kernel/010_kmod_4.4.x/test.sh index 81510a397..0b74a8fd0 100644 --- a/test/cases/020_kernel/010_kmod_4.4.x/test.sh +++ b/test/cases/020_kernel/010_kmod_4.4.x/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT # Make sure we have the latest kernel image -docker pull linuxkit/kernel:4.9.70 +docker pull linuxkit/kernel:4.9.72 # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/010_kmod_4.4.x/test.yml b/test/cases/020_kernel/010_kmod_4.4.x/test.yml index ebd98193f..aa1276a6c 100644 --- a/test/cases/020_kernel/010_kmod_4.4.x/test.yml +++ b/test/cases/020_kernel/010_kmod_4.4.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.4.106 + image: linuxkit/kernel:4.4.108 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile index cd20a063a..565267b38 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile +++ b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile @@ -3,7 +3,7 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:4.9.70 AS ksrc +FROM linuxkit/kernel:4.9.72 AS ksrc # Extract headers and compile module FROM linuxkit/alpine:d307c8a386fa3f32cddda9409b9687e191cdd6f1 AS build diff --git a/test/cases/020_kernel/011_kmod_4.9.x/test.sh b/test/cases/020_kernel/011_kmod_4.9.x/test.sh index 81510a397..0b74a8fd0 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/test.sh +++ b/test/cases/020_kernel/011_kmod_4.9.x/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT # Make sure we have the latest kernel image -docker pull linuxkit/kernel:4.9.70 +docker pull linuxkit/kernel:4.9.72 # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/011_kmod_4.9.x/test.yml b/test/cases/020_kernel/011_kmod_4.9.x/test.yml index ca706eb77..6eb3373e5 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/test.yml +++ b/test/cases/020_kernel/011_kmod_4.9.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile b/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile index ca8f1352d..1fc0b3d38 100644 --- a/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile +++ b/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile @@ -3,7 +3,7 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:4.14.7 AS ksrc +FROM linuxkit/kernel:4.14.9 AS ksrc # Extract headers and compile module FROM linuxkit/alpine:d307c8a386fa3f32cddda9409b9687e191cdd6f1 AS build diff --git a/test/cases/020_kernel/016_kmod_4.14.x/test.sh b/test/cases/020_kernel/016_kmod_4.14.x/test.sh index 81510a397..0b74a8fd0 100644 --- a/test/cases/020_kernel/016_kmod_4.14.x/test.sh +++ b/test/cases/020_kernel/016_kmod_4.14.x/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT # Make sure we have the latest kernel image -docker pull linuxkit/kernel:4.9.70 +docker pull linuxkit/kernel:4.9.72 # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/016_kmod_4.14.x/test.yml b/test/cases/020_kernel/016_kmod_4.14.x/test.yml index 7b8b45d44..e36d55de9 100644 --- a/test/cases/020_kernel/016_kmod_4.14.x/test.yml +++ b/test/cases/020_kernel/016_kmod_4.14.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.14.7 + image: linuxkit/kernel:4.14.9 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml index ed164f8ea..cb670e342 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.4.106 + image: linuxkit/kernel:4.4.108 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml index 6b272a19f..4acc5c38a 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml index 0525155a3..eeddb1040 100644 --- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml +++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.14.7 + image: linuxkit/kernel:4.14.9 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 0d0c0bc0c..d6e45efe7 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 3edc51583..8352c6423 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 5ff75ee9f..c56b01acd 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 38b3335f1..59212295c 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index f91212eaa..13ce0b902 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 39cd77611..b43e8d18d 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index b19f255c8..f381bf723 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/040_packages/005_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml index 82b5ea6e1..d3466f3db 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml index a0155098b..b18fe4a86 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml index 29baba808..d9213b36c 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index bfdee166b..83784a879 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/040_packages/005_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml index 084cb1892..2f568a213 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml index 8ff1bb1da..21f4fd9d3 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml index d5b5bc7cb..1b95116d7 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml index a0b0d683f..4fdb4b4b0 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index 15d2eb860..debd29027 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index a8e37cac2..36f2f3ddf 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index bcec14c0b..3e8385e86 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index a606b1071..293d32955 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index cbeebb419..fdf66e3d5 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 103e8ff34..14bbb9080 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index ca2b32808..180ecefb6 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 diff --git a/test/hack/test.yml b/test/hack/test.yml index 3c0a9617a..916d30857 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -1,7 +1,7 @@ # FIXME: This should use the minimal example # We continue to use the kernel-config-test as CI is currently expecting to see a success message kernel: - image: linuxkit/kernel:4.9.70 + image: linuxkit/kernel:4.9.72 cmdline: "console=ttyS0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4