Merge pull request #3001 from rn/kup

Update to kernels to 4.9.94 and 4.4.128

kernel/Dockerfile

@@ -168,8 +168,10 @@ RUN DVER=$(basename $(find /tmp/kernel-modules/lib/modules/ -mindepth 1 -maxdept
 
 RUN printf "KERNEL_SOURCE=${KERNEL_SOURCE}\n" > /out/kernel-source-info
 
-# perf (Don't compile for 4.4.x, it's broken and tedious to fix)
-RUN if [ "${KERNEL_SERIES}" != "4.4.x" ]; then \
+# perf
+# Skip for 4.4.x (the compile is broken and tedious to fix) and 4.9.x (the
+# compile broke with 4.9.94)
+RUN if [ "${KERNEL_SERIES}" != "4.4.x" && "${KERNEL_SERIES}" != "4.9.x" ]; then \
        mkdir -p /build/perf && \
        make -C tools/perf LDFLAGS=-static O=/build/perf && \
        strip /build/perf/perf && \

kernel/Makefile

@@ -223,8 +223,8 @@ $(eval $(call kernel,4.15.17,4.15.x,$(EXTRA),$(DEBUG)))
 $(eval $(call kernel,4.14.34,4.14.x,$(EXTRA),$(DEBUG)))
 $(eval $(call kernel,4.14.34,4.14.x,,-dbg))
 $(eval $(call kernel,4.14.29,4.14.x,-rt,))
-$(eval $(call kernel,4.9.93,4.9.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,4.4.127,4.4.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,4.9.94,4.9.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,4.4.128,4.4.x,$(EXTRA),$(DEBUG)))
 
 else ifeq ($(ARCH),aarch64)
 $(eval $(call kernel,4.16.2,4.16.x,$(EXTRA),$(DEBUG)))

kernel/config-4.4.x-x86_64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.4.127 Kernel Configuration
+# Linux/x86 4.4.128 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y

kernel/config-4.9.x-x86_64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.9.93 Kernel Configuration
+# Linux/x86 4.9.94 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y

kernel/patches-4.9.x/0001-tools-build-Add-test-for-sched_getcpu.patch

@@ -1,4 +1,4 @@
-From 773e0925556aa3d7b7e808ed0a7eb07604504141 Mon Sep 17 00:00:00 2001
+From fec790ff65963758fe94e7595323a4f7ce893537 Mon Sep 17 00:00:00 2001
 From: Arnaldo Carvalho de Melo <acme@redhat.com>
 Date: Thu, 2 Mar 2017 12:55:49 -0300
 Subject: [PATCH 01/12] tools build: Add test for sched_getcpu()
@@ -146,5 +146,5 @@ index 43899e0d6fa1..c3b180254f91 100644
  
  int is_printable_array(char *p, unsigned int len);
 -- 
-2.16.0
+2.16.3
 

kernel/patches-4.9.x/0002-perf-jit-Avoid-returning-garbage-for-a-ret-variable.patch

@@ -1,4 +1,4 @@
-From 137e0fdcd2d3814a0a4397ce1613a17a39d71160 Mon Sep 17 00:00:00 2001
+From 21fd7b8d98fbd8234db3a9e93f8076a56962fe38 Mon Sep 17 00:00:00 2001
 From: Arnaldo Carvalho de Melo <acme@redhat.com>
 Date: Thu, 13 Oct 2016 17:12:35 -0300
 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))) {
  		switch(jr->prefix.id) {
 -- 
-2.16.0
+2.16.3
 

kernel/patches-4.9.x/0003-hv_sock-introduce-Hyper-V-Sockets.patch

@@ -1,4 +1,4 @@
-From d61257c1aaf848160895826a560ce3586f99b4fe Mon Sep 17 00:00:00 2001
+From d95a84d8e75727b5f40b77c3b442e4e4781a666a Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Sat, 23 Jul 2016 01:35:51 +0000
 Subject: [PATCH 03/12] hv_sock: introduce Hyper-V Sockets
@@ -1787,5 +1787,5 @@ index 000000000000..331d3759f5cb
 +MODULE_DESCRIPTION("Hyper-V Sockets");
 +MODULE_LICENSE("Dual BSD/GPL");
 -- 
-2.16.0
+2.16.3
 

kernel/patches-4.9.x/0004-vmbus-Don-t-spam-the-logs-with-unknown-GUIDs.patch

@@ -1,4 +1,4 @@
-From c63200eeaf1249744d0dab9fd8f5a9c297f1da75 Mon Sep 17 00:00:00 2001
+From e7411a23194d517aa3032efd3bf8d2c4df8fbabf Mon Sep 17 00:00:00 2001
 From: Rolf Neugebauer <rolf.neugebauer@gmail.com>
 Date: Mon, 23 May 2016 18:55:45 +0100
 Subject: [PATCH 04/12] vmbus: Don't spam the logs with unknown GUIDs
@@ -26,5 +26,5 @@ index d8bc4b910192..8df02f3ca0b2 100644
  }
  
 -- 
-2.16.0
+2.16.3
 

kernel/patches-4.9.x/0005-Drivers-hv-utils-Fix-the-mapping-between-host-versio.patch

@@ -1,4 +1,4 @@
-From 55ed830a8d5aa24d28ab483399023cfc00604460 Mon Sep 17 00:00:00 2001
+From 1a00c61e9337af29dbf2958bff25f6f93c26e965 Mon Sep 17 00:00:00 2001
 From: Alex Ng <alexng@messages.microsoft.com>
 Date: Sun, 6 Nov 2016 13:14:07 -0800
 Subject: [PATCH 05/12] Drivers: hv: utils: Fix the mapping between host
@@ -44,5 +44,5 @@ index bcd06306f3e8..e7707747f56d 100644
  	}
  
 -- 
-2.16.0
+2.16.3
 

kernel/patches-4.9.x/0006-Drivers-hv-vss-Improve-log-messages.patch

@@ -1,4 +1,4 @@
-From bf7db9cf3d1930319d926a9e9b65e461f8e053dc Mon Sep 17 00:00:00 2001
+From f11cab58352b8fa2d08804be5dd933cf1d9a0099 Mon Sep 17 00:00:00 2001
 From: Alex Ng <alexng@messages.microsoft.com>
 Date: Sun, 6 Nov 2016 13:14:10 -0800
 Subject: [PATCH 06/12] Drivers: hv: vss: Improve log messages.
@@ -101,5 +101,5 @@ index a6707133c297..5c95ba1e2ecf 100644
  	return 0;
  }
 -- 
-2.16.0
+2.16.3
 

kernel/patches-4.9.x/0007-Drivers-hv-vss-Operation-timeouts-should-match-host-.patch

@@ -1,4 +1,4 @@
-From ffdcdb8f78e039acccedf2b24ebb3818608530ba Mon Sep 17 00:00:00 2001
+From d4d724c68837b751ba48784e7ce984fb27491bd6 Mon Sep 17 00:00:00 2001
 From: Alex Ng <alexng@messages.microsoft.com>
 Date: Sun, 6 Nov 2016 13:14:11 -0800
 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);
  	if (rc) {
 -- 
-2.16.0
+2.16.3
 

kernel/patches-4.9.x/0008-Drivers-hv-vmbus-Use-all-supported-IC-versions-to-ne.patch

@@ -1,4 +1,4 @@
-From 6e51bc6041fb8d5bf8e6acc966bae10fcc722170 Mon Sep 17 00:00:00 2001
+From 66bf5add7020079a45f5adcacd2ed2427e0f02b5 Mon Sep 17 00:00:00 2001
 From: Alex Ng <alexng@messages.microsoft.com>
 Date: Sat, 28 Jan 2017 12:37:17 -0700
 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_enable(struct vmbus_channel *channel);
 -- 
-2.16.0
+2.16.3
 

kernel/patches-4.9.x/0009-Drivers-hv-Log-the-negotiated-IC-versions.patch

@@ -1,4 +1,4 @@
-From 276b25d217f6510fdf45f7c7570cdb487b6ec971 Mon Sep 17 00:00:00 2001
+From 45440e7eb9144ad10169a1cb1e6451f7227698e2 Mon Sep 17 00:00:00 2001
 From: Alex Ng <alexng@messages.microsoft.com>
 Date: Sat, 28 Jan 2017 12:37:18 -0700
 Subject: [PATCH 09/12] Drivers: hv: Log the negotiated IC versions.
@@ -114,5 +114,5 @@ index f3797c07be10..89440c2eb346 100644
  					hb_srv_version & 0xFFFF);
  			}
 -- 
-2.16.0
+2.16.3
 

kernel/patches-4.9.x/0010-vmbus-fix-missed-ring-events-on-boot.patch

@@ -1,4 +1,4 @@
-From d88b097204e6b6bbc90c12aa591eaa5f509e4d24 Mon Sep 17 00:00:00 2001
+From 579f4302847860593b46aaecefd8ab5cd614fe58 Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Sun, 26 Mar 2017 16:42:20 +0800
 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)
 -- 
-2.16.0
+2.16.3
 

kernel/patches-4.9.x/0011-vmbus-remove-goto-error_clean_msglist-in-vmbus_open.patch

@@ -1,4 +1,4 @@
-From f138fb18bc080af31764391a60fe47fe7ba7a791 Mon Sep 17 00:00:00 2001
+From a4edc49571f0bab17936fbee5917b379307a5ea5 Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Wed, 29 Mar 2017 18:37:10 +0800
 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);
  	kfree(open_info);
 -- 
-2.16.0
+2.16.3
 

kernel/patches-4.9.x/0012-vmbus-dynamically-enqueue-dequeue-the-channel-on-vmb.patch

@@ -1,4 +1,4 @@
-From 4f28ab4bd72833b6963cf3d15beb765d7176e38f Mon Sep 17 00:00:00 2001
+From 8ba11bc96b7b2c05c6ed27b925f0eaf90f87bf11 Mon Sep 17 00:00:00 2001
 From: Dexuan Cui <decui@microsoft.com>
 Date: Fri, 24 Mar 2017 20:53:18 +0800
 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);
 -- 
-2.16.0
+2.16.3
 

test/cases/020_kernel/000_config_4.4.x/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.4.127
+  image: linuxkit/kernel:4.4.128
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:v0.3

test/cases/020_kernel/001_config_4.9.x/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.9.93
+  image: linuxkit/kernel:4.9.94
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:v0.3

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.127 AS ksrc
+FROM linuxkit/kernel:4.4.128 AS ksrc
 
 # Extract headers and compile module
 FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build

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.4.127
+docker pull linuxkit/kernel:4.4.128
 # Build a package
 docker build -t ${IMAGE_NAME} .
 

test/cases/020_kernel/010_kmod_4.4.x/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.4.127
+  image: linuxkit/kernel:4.4.128
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:v0.3

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.93 AS ksrc
+FROM linuxkit/kernel:4.9.94 AS ksrc
 
 # Extract headers and compile module
 FROM linuxkit/alpine:f3cd219615428b2bd943411723eb28875275fae7 AS build

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.93
+docker pull linuxkit/kernel:4.9.94
 # Build a package
 docker build -t ${IMAGE_NAME} .
 

test/cases/020_kernel/011_kmod_4.9.x/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.9.93
+  image: linuxkit/kernel:4.9.94
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:v0.3