Merge pull request #3654 from rn/kern-up

Update kernels

examples/aws.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/azure.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/cadvisor.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/dm-crypt-loop.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=tty0 console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/dm-crypt.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=tty0 console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/docker-for-mac.yml

@@ -1,6 +1,6 @@
 # This is an example for building the open source components of Docker for Mac
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 page_poison=1"
 init:
   - linuxkit/vpnkit-expose-port:b0a5ede4c53aa718b48fb9a86e4725ab6ae7f96e # install vpnkit-expose-port and vpnkit-iptables-wrapper on host

examples/docker.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/gcp.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/getty.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/hetzner.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: console=ttyS1
   ucode: intel-ucode.cpio
 init:

examples/hostmount-writeable-overlay.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/influxdb-os.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/logging.yml

@@ -1,6 +1,6 @@
 # Simple example of using an external logging service
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/minimal.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/node_exporter.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=tty0 console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/openstack.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/packet.arm64.yml

@@ -5,7 +5,7 @@
 # for arm64 then the 'ucode' line in the kernel section can be left
 # out.
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyAMA0"
   ucode: ""
 onboot:

examples/packet.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: console=ttyS1
   ucode: intel-ucode.cpio
 init:

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:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/scaleway.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/sshd.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/static-ip.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/swap.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/tpm.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=tty0 console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/vmware.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=tty0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/vpnkit-forwarder.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/vsudd-containerd.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/vultr.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/wireguard.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

kernel/Dockerfile

@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS kernel-build
+FROM linuxkit/alpine:2be490394653b7967c250e86fd42cef88de428ba AS kernel-build
 RUN apk add \
     argp-standalone \
     automake \

kernel/Dockerfile.bcc

@@ -1,7 +1,7 @@
 ARG IMAGE
 FROM ${IMAGE} as ksrc
 
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
+FROM linuxkit/alpine:2be490394653b7967c250e86fd42cef88de428ba AS build
 RUN apk update && apk upgrade -a && \
   apk add --no-cache \
   argp-standalone \
@@ -26,7 +26,7 @@ RUN apk update && apk upgrade -a && \
   llvm-static \
   luajit-dev \
   m4 \
-  python \
+  python3 \
   zlib-dev \
   && true
 
@@ -102,7 +102,7 @@ RUN mkdir -p /out/usr/bin && \
 RUN mkdir -p /out/usr/local/share/ && \
     cp -a /usr/local/share/lua /out/usr/local/share/
 
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 as mirror
+FROM linuxkit/alpine:2be490394653b7967c250e86fd42cef88de428ba as mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk update && apk upgrade -a && \
   apk add --no-cache --initdb -p /out \

kernel/Dockerfile.kconfig

@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS kernel-build
+FROM linuxkit/alpine:2be490394653b7967c250e86fd42cef88de428ba AS kernel-build
 RUN apk add \
     argp-standalone \
     bison \

kernel/Dockerfile.perf

@@ -3,7 +3,7 @@
 ARG IMAGE
 FROM ${IMAGE} AS ksrc
 
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
+FROM linuxkit/alpine:2be490394653b7967c250e86fd42cef88de428ba AS build
 RUN apk add \
     argp-standalone \
     bash \
@@ -18,6 +18,7 @@ RUN apk add \
     kmod \
     elfutils-dev \
     findutils \
+    libelf-static \
     mpc1-dev \
     mpfr-dev \
     python3 \

kernel/Dockerfile.zfs

@@ -1,6 +1,6 @@
 ARG IMAGE
 FROM ${IMAGE} AS ksrc
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
+FROM linuxkit/alpine:2be490394653b7967c250e86fd42cef88de428ba AS build
 RUN apk add \
     attr-dev \
     autoconf \

kernel/Makefile

@@ -145,9 +145,9 @@ show-tags: show-tag_$(2)$(3)$(4)
 # with DCT as part of the dependency on build_$(2)$(3)$(4) and then build
 # with DOCKER_CONTENT_TRUST explicitly set to 0
 
-# Only build perf on x86 and latest LTS and stable kernels
+# Only build perf only on x86 and recent LTS and latest stable kernels
 ifeq ($(ARCH),x86_64)
-ifeq ($(2), $(filter $(2),5.6.x 5.4.x))
+ifeq ($(2), $(filter $(2),5.11.x 5.10.x 5.4.x))
 build_perf_$(2)$(3)$(4): build_$(2)$(3)$(4)
 	docker pull $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \
 		 DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.perf \
@@ -183,9 +183,9 @@ forcepush: forcepush_perf_$(2)$(3)$(4)
 endif
 endif
 
-# Only build BCC on x86 and only on latest LTS and latest stable kernels.
+# Only build bcc only on x86 and recent LTS and latest stable kernels
 ifeq ($(ARCH),x86_64)
-ifeq ($(2), $(filter $(2),5.6.x 5.4.x))
+ifeq ($(2), $(filter $(2),5.11.x 5.10.x 5.4.x))
 build_bcc_$(2)$(3)$(4): build_$(2)$(3)$(4)
 	docker pull $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \
 		 DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.bcc \
@@ -214,11 +214,11 @@ forcepush_bcc_$(2)$(3)$(4): forcebuild_bcc_$(2)$(3)$(4)
 	$(PUSH_MANIFEST) $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG) $(DOCKER_CONTENT_TRUST) && \
 	$(PUSH_MANIFEST) $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4) $(DOCKER_CONTENT_TRUST)
 
-
+# Disable bcc build as it is failing: https://github.com/linuxkit/linuxkit/issues/3652
-build: build_bcc_$(2)$(3)$(4)
+# build: build_bcc_$(2)$(3)$(4)
-forcebuild: forcebuild_bcc_$(2)$(3)$(4)
+# forcebuild: forcebuild_bcc_$(2)$(3)$(4)
-push: push_bcc_$(2)$(3)$(4)
+# push: push_bcc_$(2)$(3)$(4)
-forcepush: forcepush_bcc_$(2)$(3)$(4)
+# forcepush: forcepush_bcc_$(2)$(3)$(4)
 endif
 endif
 
@@ -248,23 +248,20 @@ endef
 # Debug targets only for latest stable and LTS stable
 #
 ifeq ($(ARCH),x86_64)
-$(eval $(call kernel,5.11.15,5.11.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,5.11.18,5.11.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,5.10.31,5.10.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,5.10.34,5.10.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,5.4.113,5.4.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,5.10.34,5.10.x,,-dbg))
-$(eval $(call kernel,5.4.113,5.4.x,,-dbg))
+$(eval $(call kernel,5.4.116,5.4.x,$(EXTRA),$(DEBUG)))
 #$(eval $(call kernel,5.4.28,5.4.x,-rt,))
-$(eval $(call kernel,4.19.188,4.19.x,$(EXTRA),$(DEBUG)))
 
 else ifeq ($(ARCH),$(filter $(ARCH),aarch64 arm64))
-$(eval $(call kernel,5.11.15,5.11.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,5.11.18,5.11.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,5.10.11,5.10.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,5.10.34,5.10.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,5.4.39,5.4.x,$(EXTRA),$(DEBUG)))
 #$(eval $(call kernel,5.4.28,5.4.x,-rt,))
 
 else ifeq ($(ARCH),s390x)
-$(eval $(call kernel,5.11.15,5.11.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,5.11.18,5.11.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,5.10.31,5.10.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,5.10.34,5.10.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,5.4.113,5.4.x,$(EXTRA),$(DEBUG)))
 endif
 
 # Target for kernel config

kernel/config-5.10.x-aarch64

@@ -1,11 +1,11 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.31 Kernel Configuration
+# Linux/arm64 5.10.34 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Alpine 9.2.0) 9.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
+CONFIG_GCC_VERSION=100201
-CONFIG_LD_VERSION=233010000
+CONFIG_LD_VERSION=235020000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
@@ -407,6 +407,7 @@ CONFIG_ARM64_TAGGED_ADDR_ABI=y
 #
 CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_PAN=y
+CONFIG_AS_HAS_LSE_ATOMICS=y
 CONFIG_ARM64_LSE_ATOMICS=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM64_VHE=y
@@ -428,6 +429,7 @@ CONFIG_ARM64_PTR_AUTH=y
 CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y
 CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y
 CONFIG_AS_HAS_PAC=y
+CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y
 # end of ARMv8.3 architectural features
 
 #
@@ -442,6 +444,7 @@ CONFIG_ARM64_TLB_RANGE=y
 # ARMv8.5 architectural features
 #
 CONFIG_ARM64_BTI=y
+CONFIG_ARM64_BTI_KERNEL=y
 CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
 CONFIG_ARM64_E0PD=y
 CONFIG_ARCH_RANDOM=y

kernel/config-5.10.x-s390x

@@ -1,11 +1,11 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 5.10.31 Kernel Configuration
+# Linux/s390 5.10.34 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Alpine 9.2.0) 9.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
+CONFIG_GCC_VERSION=100201
-CONFIG_LD_VERSION=233010000
+CONFIG_LD_VERSION=235020000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
@@ -268,6 +268,7 @@ CONFIG_MARCH_Z196=y
 # CONFIG_MARCH_ZEC12 is not set
 # CONFIG_MARCH_Z13 is not set
 # CONFIG_MARCH_Z14 is not set
+# CONFIG_MARCH_Z15 is not set
 CONFIG_MARCH_Z196_TUNE=y
 CONFIG_TUNE_DEFAULT=y
 # CONFIG_TUNE_Z900 is not set
@@ -278,6 +279,7 @@ CONFIG_TUNE_DEFAULT=y
 # CONFIG_TUNE_ZEC12 is not set
 # CONFIG_TUNE_Z13 is not set
 # CONFIG_TUNE_Z14 is not set
+# CONFIG_TUNE_Z15 is not set
 CONFIG_64BIT=y
 CONFIG_COMPAT=y
 CONFIG_SYSVIPC_COMPAT=y

kernel/config-5.10.x-x86_64

@@ -1,11 +1,11 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.31 Kernel Configuration
+# Linux/x86 5.10.34 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Alpine 9.2.0) 9.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
+CONFIG_GCC_VERSION=100201
-CONFIG_LD_VERSION=233010000
+CONFIG_LD_VERSION=235020000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y

kernel/config-5.11.x-aarch64

@@ -1,11 +1,11 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.11.15 Kernel Configuration
+# Linux/arm64 5.11.18 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Alpine 9.2.0) 9.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
+CONFIG_GCC_VERSION=100201
-CONFIG_LD_VERSION=233010000
+CONFIG_LD_VERSION=235020000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
@@ -408,6 +408,7 @@ CONFIG_ARM64_TAGGED_ADDR_ABI=y
 CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_PAN=y
 CONFIG_AS_HAS_LDAPR=y
+CONFIG_AS_HAS_LSE_ATOMICS=y
 CONFIG_ARM64_LSE_ATOMICS=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM64_VHE=y
@@ -428,6 +429,7 @@ CONFIG_ARM64_PTR_AUTH=y
 CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y
 CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y
 CONFIG_AS_HAS_PAC=y
+CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y
 # end of ARMv8.3 architectural features
 
 #
@@ -443,6 +445,7 @@ CONFIG_ARM64_TLB_RANGE=y
 #
 CONFIG_AS_HAS_ARMV8_5=y
 CONFIG_ARM64_BTI=y
+CONFIG_ARM64_BTI_KERNEL=y
 CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
 CONFIG_ARM64_E0PD=y
 CONFIG_ARCH_RANDOM=y

kernel/config-5.11.x-s390x

@@ -1,11 +1,11 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 5.11.15 Kernel Configuration
+# Linux/s390 5.11.18 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Alpine 9.2.0) 9.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
+CONFIG_GCC_VERSION=100201
-CONFIG_LD_VERSION=233010000
+CONFIG_LD_VERSION=235020000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y
@@ -267,6 +267,7 @@ CONFIG_MARCH_Z196=y
 # CONFIG_MARCH_ZEC12 is not set
 # CONFIG_MARCH_Z13 is not set
 # CONFIG_MARCH_Z14 is not set
+# CONFIG_MARCH_Z15 is not set
 CONFIG_MARCH_Z196_TUNE=y
 CONFIG_TUNE_DEFAULT=y
 # CONFIG_TUNE_Z900 is not set
@@ -277,6 +278,7 @@ CONFIG_TUNE_DEFAULT=y
 # CONFIG_TUNE_ZEC12 is not set
 # CONFIG_TUNE_Z13 is not set
 # CONFIG_TUNE_Z14 is not set
+# CONFIG_TUNE_Z15 is not set
 CONFIG_64BIT=y
 CONFIG_COMPAT=y
 CONFIG_SYSVIPC_COMPAT=y

kernel/config-5.11.x-x86_64

@@ -1,11 +1,11 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.11.15 Kernel Configuration
+# Linux/x86 5.11.18 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Alpine 9.2.0) 9.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
+CONFIG_GCC_VERSION=100201
-CONFIG_LD_VERSION=233010000
+CONFIG_LD_VERSION=235020000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
 CONFIG_CC_CAN_LINK=y

kernel/config-5.4.x-x86_64

@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.113 Kernel Configuration
+# Linux/x86 5.4.116 Kernel Configuration
 #
 
 #
-# Compiler: gcc (Alpine 9.2.0) 9.2.0
+# Compiler: gcc (Alpine 10.2.1_pre1) 10.2.1 20201203
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90200
+CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y

kernel/patches-5.10.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch

@@ -0,0 +1,55 @@
+From 3635a8090f2271103511b68a5853b1d7e0a925b5 Mon Sep 17 00:00:00 2001
+From: Matt Redfearn <matt.redfearn@mips.com>
+Date: Wed, 3 Jan 2018 09:57:30 +0000
+Subject: [PATCH] include/uapi/linux/swab: Fix potentially missing
+ __always_inline
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit bc27fb68aaad ("include/uapi/linux/byteorder, swab: force inlining
+of some byteswap operations") added __always_inline to swab functions
+and commit 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to
+userspace headers") added a definition of __always_inline for use in
+exported headers when the kernel's compiler.h is not available.
+
+However, since swab.h does not include stddef.h, if the header soup does
+not indirectly include it, the definition of __always_inline is missing,
+resulting in a compilation failure, which was observed compiling the
+perf tool using exported headers containing this commit:
+
+In file included from /usr/include/linux/byteorder/little_endian.h:12:0,
+                 from /usr/include/asm/byteorder.h:14,
+                 from tools/include/uapi/linux/perf_event.h:20,
+                 from perf.h:8,
+                 from builtin-bench.c:18:
+/usr/include/linux/swab.h:160:8: error: unknown type name ‘__always_inline’
+ static __always_inline __u16 __swab16p(const __u16 *p)
+
+Fix this by replacing the inclusion of linux/compiler.h with
+linux/stddef.h to ensure that we pick up that definition if required,
+without relying on it's indirect inclusion. compiler.h is then included
+indirectly, via stddef.h.
+
+Fixes: 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to userspace headers")
+Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
+---
+ include/uapi/linux/swab.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
+index 7272f85d6d6a..3736f2fe1541 100644
+--- a/include/uapi/linux/swab.h
++++ b/include/uapi/linux/swab.h
+@@ -3,7 +3,7 @@
+ #define _UAPI_LINUX_SWAB_H
+ 
+ #include <linux/types.h>
+-#include <linux/compiler.h>
++#include <linux/stddef.h>
+ #include <asm/bitsperlong.h>
+ #include <asm/swab.h>
+ 
+-- 
+2.26.2
+

kernel/patches-5.11.x/0001-include-uapi-linux-swab-Fix-potentially-missing-__al.patch

@@ -0,0 +1,55 @@
+From 3635a8090f2271103511b68a5853b1d7e0a925b5 Mon Sep 17 00:00:00 2001
+From: Matt Redfearn <matt.redfearn@mips.com>
+Date: Wed, 3 Jan 2018 09:57:30 +0000
+Subject: [PATCH] include/uapi/linux/swab: Fix potentially missing
+ __always_inline
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit bc27fb68aaad ("include/uapi/linux/byteorder, swab: force inlining
+of some byteswap operations") added __always_inline to swab functions
+and commit 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to
+userspace headers") added a definition of __always_inline for use in
+exported headers when the kernel's compiler.h is not available.
+
+However, since swab.h does not include stddef.h, if the header soup does
+not indirectly include it, the definition of __always_inline is missing,
+resulting in a compilation failure, which was observed compiling the
+perf tool using exported headers containing this commit:
+
+In file included from /usr/include/linux/byteorder/little_endian.h:12:0,
+                 from /usr/include/asm/byteorder.h:14,
+                 from tools/include/uapi/linux/perf_event.h:20,
+                 from perf.h:8,
+                 from builtin-bench.c:18:
+/usr/include/linux/swab.h:160:8: error: unknown type name ‘__always_inline’
+ static __always_inline __u16 __swab16p(const __u16 *p)
+
+Fix this by replacing the inclusion of linux/compiler.h with
+linux/stddef.h to ensure that we pick up that definition if required,
+without relying on it's indirect inclusion. compiler.h is then included
+indirectly, via stddef.h.
+
+Fixes: 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to userspace headers")
+Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
+---
+ include/uapi/linux/swab.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
+index 7272f85d6d6a..3736f2fe1541 100644
+--- a/include/uapi/linux/swab.h
++++ b/include/uapi/linux/swab.h
+@@ -3,7 +3,7 @@
+ #define _UAPI_LINUX_SWAB_H
+ 
+ #include <linux/types.h>
+-#include <linux/compiler.h>
++#include <linux/stddef.h>
+ #include <asm/bitsperlong.h>
+ #include <asm/swab.h>
+ 
+-- 
+2.26.2
+

linuxkit.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

projects/compose/compose-dynamic.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 page_poison=1"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

projects/compose/compose-static.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 page_poison=1"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

projects/miragesdk/examples/mirage-dhcp.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 page_poison=1"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/000_build/000_formats/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/000_build/010_reproducible/test.yml

@@ -1,6 +1,6 @@
 # NOTE: Images build from this file likely do not run
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/010_platforms/000_qemu/010_run_iso/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/010_platforms/000_qemu/020_run_efi/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/010_platforms/000_qemu/050_run_aws/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/010_platforms/000_qemu/100_container/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/010_platforms/010_hyperkit/010_acpi/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/010_platforms/110_gcp/000_run/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/020_kernel/005_config_4.19.x/test.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-# SUMMARY: Sanity check on the kernel config file
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=kconfig
-
-clean_up() {
-	rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-# Test code goes here
-linuxkit build -format kernel+initrd -name "${NAME}" test.yml
-RESULT="$(linuxkit run ${NAME})"
-echo "${RESULT}" | grep -q "suite PASSED"
-
-exit 0

test/cases/020_kernel/005_config_4.19.x/test.yml

@@ -1,15 +0,0 @@
-kernel:
-  image: linuxkit/kernel:4.19.121
-  cmdline: "console=ttyS0 console=ttyAMA0"
-init:
-  - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6
-  - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d
-onboot:
-  - name: check-kernel-config
-    image: linuxkit/test-kernel-config:6b4d6aff84721c069ec38a89c88c2d725b6cc6c0
-  - name: poweroff
-    image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f
-    command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/011_config_5.4.x/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.4.116
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/020_kernel/013_config_5.10.x/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.10.31
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/020_kernel/014_config_5.11.x/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.11.15
+  image: linuxkit/kernel:5.11.18
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/020_kernel/105_kmod_4.19.x/Dockerfile

@@ -1,23 +0,0 @@
-# This Dockerfile extracts the kernel headers from the kernel image
-# and then compiles a simple hello world kernel module against them.
-# In the last stage, it creates a package, which can be used for
-# testing.
-
-FROM linuxkit/kernel:4.19.121 AS ksrc
-
-# Extract headers and compile module
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
-RUN apk add build-base elfutils-dev
-
-COPY --from=ksrc /kernel-dev.tar /
-RUN tar xf kernel-dev.tar
-
-WORKDIR /kmod
-COPY ./src/* ./
-RUN make all
-
-# Package
-FROM alpine:3.11
-COPY --from=build /kmod/hello_world.ko /
-COPY check.sh /check.sh
-ENTRYPOINT ["/bin/sh", "/check.sh"]

test/cases/020_kernel/105_kmod_4.19.x/check.sh

@@ -1,15 +0,0 @@
-#!/bin/sh
-function failed {
-	printf "Kernel module test suite FAILED\n"
-	/sbin/poweroff -f
-}
-
-uname -a
-modinfo hello_world.ko || failed
-insmod hello_world.ko || failed
-[ -n "$(dmesg | grep -o 'Hello LinuxKit')" ] || failed
-rmmod hello_world || failed
-
-printf "Kernel module test suite PASSED\n"
-
-/sbin/poweroff -f

test/cases/020_kernel/105_kmod_4.19.x/src/Makefile

@@ -1,6 +0,0 @@
-obj-m += hello_world.o
-KVER=$(shell basename /usr/src/linux-headers-*)
-all:
-	make -C /usr/src/$(KVER) M=$(PWD) modules
-clean:
-	make -C /usr/src/$(KVER) M=$(PWD) clean

test/cases/020_kernel/105_kmod_4.19.x/src/hello_world.c

@@ -1,22 +0,0 @@
-/*  
- * A simple Hello World kernel module 
- */
-#include <linux/module.h>
-#include <linux/kernel.h>
-
-int init_hello(void)
-{
-	printk(KERN_INFO "Hello LinuxKit\n");
-	return 0;
-}
-
-void exit_hello(void)
-{
-	printk(KERN_INFO "Goodbye LinuxKit.\n");
-}
-
-module_init(init_hello);
-module_exit(exit_hello);
-MODULE_AUTHOR("Rolf Neugebauer <rolf.neugebauer@docker.com>");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("A simple Hello World kernel module for testing");

test/cases/020_kernel/105_kmod_4.19.x/test.sh

@@ -1,31 +0,0 @@
-#!/bin/sh
-# SUMMARY: Test build and insertion of kernel modules
-# LABELS:
-# REPEAT:
-
-set -e
-
-# Source libraries. Uncomment if needed/defined
-#. "${RT_LIB}"
-. "${RT_PROJECT_ROOT}/_lib/lib.sh"
-
-NAME=kmod
-IMAGE_NAME=kmod-test
-
-clean_up() {
-	docker rmi ${IMAGE_NAME} || true
-	rm -rf ${NAME}-*
-}
-trap clean_up EXIT
-
-# Make sure we have the latest kernel image
-docker pull linuxkit/kernel:4.19.121
-# Build a package
-docker build -t ${IMAGE_NAME} .
-
-# Build and run a LinuxKit image with kernel module (and test script)
-linuxkit build -docker -format kernel+initrd -name "${NAME}" test.yml
-RESULT="$(linuxkit run ${NAME})"
-echo "${RESULT}" | grep -q "Hello LinuxKit"
-
-exit 0

test/cases/020_kernel/105_kmod_4.19.x/test.yml

@@ -1,20 +0,0 @@
-kernel:
-  image: linuxkit/kernel:4.19.121
-  cmdline: "console=ttyS0 console=ttyAMA0"
-init:
-  - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6
-  - linuxkit/runc:bf1e0c61fb4678d6428d0aabbd80db5ea24e4d4d
-onboot:
-  - name: check
-    image: kmod-test
-    binds:
-     - /dev:/dev
-     - /lib/modules:/lib/modules
-    capabilities:
-     - all
-  - name: poweroff
-    image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f
-    command: ["/bin/sh", "/poweroff.sh", "3"]
-trust:
-  org:
-    - linuxkit

test/cases/020_kernel/111_kmod_5.4.x/Dockerfile

@@ -3,10 +3,10 @@
 # In the last stage, it creates a package, which can be used for
 # testing.
 
-FROM linuxkit/kernel:5.4.113 AS ksrc
+FROM linuxkit/kernel:5.4.116 AS ksrc
 
 # Extract headers and compile module
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
+FROM linuxkit/alpine:2be490394653b7967c250e86fd42cef88de428ba AS build
 RUN apk add build-base elfutils-dev
 
 COPY --from=ksrc /kernel-dev.tar /

test/cases/020_kernel/111_kmod_5.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:5.4.113
+docker pull linuxkit/kernel:5.4.116
 # Build a package
 docker build -t ${IMAGE_NAME} .
 

test/cases/020_kernel/111_kmod_5.4.x/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.4.116
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/020_kernel/113_kmod_5.10.x/Dockerfile

@@ -3,10 +3,10 @@
 # In the last stage, it creates a package, which can be used for
 # testing.
 
-FROM linuxkit/kernel:5.10.31 AS ksrc
+FROM linuxkit/kernel:5.10.34 AS ksrc
 
 # Extract headers and compile module
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
+FROM linuxkit/alpine:2be490394653b7967c250e86fd42cef88de428ba AS build
 RUN apk add build-base elfutils-dev
 
 COPY --from=ksrc /kernel-dev.tar /

test/cases/020_kernel/113_kmod_5.10.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:5.10.31
+docker pull linuxkit/kernel:5.10.34
 # Build a package
 docker build -t ${IMAGE_NAME} .
 

test/cases/020_kernel/113_kmod_5.10.x/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.10.31
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/020_kernel/114_kmod_5.11.x/Dockerfile

@@ -3,10 +3,10 @@
 # In the last stage, it creates a package, which can be used for
 # testing.
 
-FROM linuxkit/kernel:5.11.15 AS ksrc
+FROM linuxkit/kernel:5.11.18 AS ksrc
 
 # Extract headers and compile module
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 AS build
+FROM linuxkit/alpine:2be490394653b7967c250e86fd42cef88de428ba AS build
 RUN apk add build-base elfutils-dev
 
 COPY --from=ksrc /kernel-dev.tar /

test/cases/020_kernel/114_kmod_5.11.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:5.11.15
+docker pull linuxkit/kernel:5.11.18
 # Build a package
 docker build -t ${IMAGE_NAME} .
 

test/cases/020_kernel/114_kmod_5.11.x/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.11.15
+  image: linuxkit/kernel:5.11.18
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/020_kernel/200_namespace/common.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/030_security/000_docker-bench/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/030_security/010_ports/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 page_poison=1"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/040_packages/002_binfmt/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/040_packages/002_bpftrace/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/040_packages/003_ca-certificates/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/040_packages/003_containerd/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/040_packages/004_dhcpcd/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/040_packages/004_dm-crypt/000_simple/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/040_packages/004_dm-crypt/001_luks/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/040_packages/004_dm-crypt/002_key/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/040_packages/005_extend/000_ext4/test-create.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/040_packages/005_extend/000_ext4/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/040_packages/005_extend/001_btrfs/test-create.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/040_packages/005_extend/001_btrfs/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.4.113
+  image: linuxkit/kernel:5.10.34
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6