Merge pull request #3704 from rn/kern-up

Update kernels to 5.10.47/5.4.129, remove 5.11.x and add 5.12.x

examples/aws.yml

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

examples/azure.yml

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

examples/cadvisor.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   cmdline: "console=tty0 console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/dm-crypt.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/getty.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   cmdline: console=ttyS1
   ucode: intel-ucode.cpio
 init:

examples/hostmount-writeable-overlay.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/minimal.yml

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

examples/node_exporter.yml

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

examples/openstack.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   cmdline: "console=ttyAMA0"
   ucode: ""
 onboot:

examples/packet.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/swap.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   cmdline: "console=tty0 console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

examples/vmware.yml

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

examples/vpnkit-forwarder.yml

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

examples/vsudd-containerd.yml

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

examples/vultr.yml

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

examples/wireguard.yml

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

kernel/Dockerfile

@@ -18,6 +18,7 @@ RUN apk add \
     installkernel \
     kmod \
     elfutils-dev \
+    libunwind-dev \
     linux-headers \
     mpc1-dev \
     mpfr-dev \
@@ -32,9 +33,6 @@ RUN apk add \
     xz-dev \
     zlib-dev
 
-# libunwind-dev pkg is missing for s390x for now. Only install on other arch
-RUN [ $(uname -m) != s390x ] && apk add libunwind-dev || true
-
 ARG KERNEL_VERSION
 ARG KERNEL_SERIES
 ARG EXTRA
@@ -107,7 +105,6 @@ RUN set -e && \
 RUN tar cJf /out/src/linux.tar.xz /linux
 
 # Kernel config
-# The s390x defconfig moved with 5.2.x
 RUN case $(uname -m) in \
     x86_64) \
         KERNEL_DEF_CONF=/linux/arch/x86/configs/x86_64_defconfig; \
@@ -115,13 +112,6 @@ RUN case $(uname -m) in \
     aarch64) \
         KERNEL_DEF_CONF=/linux/arch/arm64/configs/defconfig; \
         ;; \
-    s390x) \
-        if [ -f /linux/arch/s390/defconfig ]; then \
-            KERNEL_DEF_CONF=/linux/arch/s390/defconfig; \
-        else \
-            KERNEL_DEF_CONF=/linux/arch/s390/configs/defconfig; \
-        fi; \
-        ;; \
     esac  && \
     cp /config-${KERNEL_SERIES}-$(uname -m) ${KERNEL_DEF_CONF}; \
     if [ -n "${EXTRA}" ] && [ -f "/config-${KERNEL_SERIES}-$(uname -m)${EXTRA}" ]; then \
@@ -138,15 +128,7 @@ RUN case $(uname -m) in \
 
 
 # Kernel
-RUN case $(uname -m) in \
+RUN make -j "$(getconf _NPROCESSORS_ONLN)" KCFLAGS="-fno-pie" && \
-    s390x) \
-        KCFLAGS="-fno-pie -fPIC"; \
-        ;; \
-    *) \
-        KCFLAGS="-fno-pie"; \
-        ;; \
-    esac && \
-    make -j "$(getconf _NPROCESSORS_ONLN)" KCFLAGS="$KCFLAGS" && \
     case $(uname -m) in \
     x86_64) \
         cp arch/x86_64/boot/bzImage /out/kernel; \
@@ -154,9 +136,6 @@ RUN case $(uname -m) in \
     aarch64) \
         cp arch/arm64/boot/Image.gz /out/kernel; \
         ;; \
-    s390x) \
-        cp arch/s390/boot/bzImage /out/kernel; \
-        ;; \
     esac && \
     cp System.map /out && \
     ([ -n "${DEBUG}" ] && cp vmlinux /out || true)

kernel/Dockerfile.kconfig

@@ -1,7 +1,8 @@
 ARG BUILD_IMAGE
+FROM ${BUILD_IMAGE} AS kernel-build
+
 ARG KERNEL_VERSIONS
 
-FROM ${BUILD_IMAGE} AS kernel-build
 RUN apk add \
     argp-standalone \
     bison \
@@ -44,13 +45,6 @@ RUN set -e && \
         fi && \
         [ ! -f /config-${SERIES}-x86_64 ] || mv /config-${SERIES}-x86_64 arch/x86/configs/x86_64_defconfig && \
         [ ! -f /config-${SERIES}-aarch64 ] || mv /config-${SERIES}-aarch64 arch/arm64/configs/defconfig ; \
-        if [ -f /config-${SERIES}-s390x ]; then \
-            if [ -f /linux/arch/s390/defconfig ]; then \
-                mv /config-${SERIES}-s390x arch/s390/defconfig; \
-            else \
-                mv /config-${SERIES}-s390x arch/s390/configs/defconfig; \
-            fi; \
-        fi; \
     done
 
 ENTRYPOINT ["/bin/sh"]

kernel/Makefile

@@ -49,9 +49,6 @@ endif
 ifeq ($(ARCH),$(filter $(ARCH),aarch64 arm64))
 SUFFIX=-arm64
 endif
-ifeq ($(ARCH),s390x)
-SUFFIX=-s390x
-endif
 
 TAG=$(HASH)$(DIRTY)
 
@@ -159,7 +156,7 @@ show-tags: show-tag_$(2)$(3)$(4)
 
 # Only build perf only on x86 and recent LTS and latest stable kernels
 ifeq ($(ARCH),x86_64)
-ifeq ($(2), $(filter $(2),5.11.x 5.10.x 5.4.x))
+ifeq ($(2), $(filter $(2),5.12.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 build -f Dockerfile.perf \
@@ -197,7 +194,7 @@ endif
 
 # Only build bcc only on x86 and recent LTS and latest stable kernels
 ifeq ($(ARCH),x86_64)
-ifeq ($(2), $(filter $(2),5.11.x 5.10.x 5.4.x))
+ifeq ($(2), $(filter $(2),5.12.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 build -f Dockerfile.bcc \
@@ -259,20 +256,17 @@ endef
 # Debug targets only for latest stable and LTS stable
 #
 ifeq ($(ARCH),x86_64)
-$(eval $(call kernel,5.11.22,5.11.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,5.12.14,5.12.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,5.10.39,5.10.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,5.10.47,5.10.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,5.10.39,5.10.x,,-dbg))
+$(eval $(call kernel,5.10.47,5.10.x,,-dbg))
-$(eval $(call kernel,5.4.121,5.4.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,5.4.129,5.4.x,$(EXTRA),$(DEBUG)))
 $(eval $(call kernel,5.11.4,5.11.x,-rt,))
 
 else ifeq ($(ARCH),$(filter $(ARCH),aarch64 arm64))
-$(eval $(call kernel,5.11.22,5.11.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,5.12.14,5.12.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,5.10.39,5.10.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,5.10.47,5.10.x,$(EXTRA),$(DEBUG)))
 $(eval $(call kernel,5.11.4,5.11.x,-rt,))
 
-else ifeq ($(ARCH),s390x)
-$(eval $(call kernel,5.11.22,5.11.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,5.10.39,5.10.x,$(EXTRA),$(DEBUG)))
 endif
 
 # Target for kernel config

kernel/config-5.10.x-aarch64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.39 Kernel Configuration
+# Linux/arm64 5.10.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -4302,7 +4302,7 @@ CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZ4=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_ZSTD is not set
+CONFIG_SQUASHFS_ZSTD=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3

kernel/config-5.10.x-x86_64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.39 Kernel Configuration
+# Linux/x86 5.10.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -3875,7 +3875,7 @@ CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZ4=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_ZSTD is not set
+CONFIG_SQUASHFS_ZSTD=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3

kernel/config-5.11.x-aarch64

@@ -4308,7 +4308,7 @@ CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZ4=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_ZSTD is not set
+CONFIG_SQUASHFS_ZSTD=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3

kernel/config-5.11.x-x86_64

@@ -3891,7 +3891,7 @@ CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZ4=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_ZSTD is not set
+CONFIG_SQUASHFS_ZSTD=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3

kernel/config-5.4.x-x86_64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.121 Kernel Configuration
+# Linux/x86 5.4.129 Kernel Configuration
 #
 
 #
@@ -3825,7 +3825,7 @@ CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZ4=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
-# CONFIG_SQUASHFS_ZSTD is not set
+CONFIG_SQUASHFS_ZSTD=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
@@ -4310,7 +4310,7 @@ CONFIG_LZ4_COMPRESS=y
 CONFIG_LZ4HC_COMPRESS=y
 CONFIG_LZ4_DECOMPRESS=y
 CONFIG_ZSTD_COMPRESS=m
-CONFIG_ZSTD_DECOMPRESS=m
+CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y

kernel/patches-5.12.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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   cmdline: "console=ttyS0 page_poison=1"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

projects/compose/compose-static.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   cmdline: "console=ttyS0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

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

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

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

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

test/cases/020_kernel/015_config_5.12.x/test.yml

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

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.121 AS ksrc
+FROM linuxkit/kernel:5.4.129 AS ksrc
 
 # Extract headers and compile module
-FROM linuxkit/kernel:5.4.121-builder AS build
+FROM linuxkit/kernel:5.4.129-builder 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.121
+docker pull linuxkit/kernel:5.4.129
 # 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.121
+  image: linuxkit/kernel:5.4.129
   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.39 AS ksrc
+FROM linuxkit/kernel:5.10.47 AS ksrc
 
 # Extract headers and compile module
-FROM linuxkit/kernel:5.10.39-builder AS build
+FROM linuxkit/kernel:5.10.47-builder 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.39
+docker pull linuxkit/kernel:5.10.47
 # 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.39
+  image: linuxkit/kernel:5.10.47
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/020_kernel/115_kmod_5.12.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.22 AS ksrc
+FROM linuxkit/kernel:5.12.14 AS ksrc
 
 # Extract headers and compile module
-FROM linuxkit/kernel:5.11.22-builder AS build
+FROM linuxkit/kernel:5.12.14-builder AS build
 RUN apk add build-base elfutils-dev
 
 COPY --from=ksrc /kernel-dev.tar /

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

test/cases/020_kernel/115_kmod_5.12.x/test.yml

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.11.22
+  image: linuxkit/kernel:5.12.14
   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.10.39
+  image: linuxkit/kernel:5.10.47
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/020_kernel/211_tags_5.4.x/test.sh

@@ -5,7 +5,7 @@
 
 set -e
 
-KERNEL=linuxkit/kernel:5.4.121
+KERNEL=linuxkit/kernel:5.4.129
 
 # just include the common test
 . ../tags.sh

test/cases/020_kernel/213_tags_5.10.x/test.sh

@@ -5,7 +5,7 @@
 
 set -e
 
-KERNEL=linuxkit/kernel:5.10.39
+KERNEL=linuxkit/kernel:5.10.47
 
 # just include the common test
 . ../tags.sh

test/cases/020_kernel/215_tags_5.12.x/test.sh

@@ -5,7 +5,7 @@
 
 set -e
 
-KERNEL=linuxkit/kernel:5.11.22
+KERNEL=linuxkit/kernel:5.12.14
 
 # just include the common test
 . ../tags.sh

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

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

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

@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:5.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   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.10.39
+  image: linuxkit/kernel:5.10.47
   cmdline: "console=ttyS0 console=ttyAMA0"
 init:
   - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6

test/cases/040_packages/005_extend/002_xfs/test-create.yml

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

test/cases/040_packages/005_extend/002_xfs/test.yml

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

test/cases/040_packages/005_extend/003_gpt/test-create.yml

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

test/cases/040_packages/005_extend/003_gpt/test.yml

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

test/cases/040_packages/006_format_mount/000_auto/test.yml

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

test/cases/040_packages/006_format_mount/001_by_label/test.yml

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

test/cases/040_packages/006_format_mount/002_by_name/test.yml.in

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

test/cases/040_packages/006_format_mount/003_btrfs/test.yml

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