Merge pull request #3163 from rn/kernel-up

Update kernels, Intel ucode and add 4.18.x kernels
2025-09-02 23:47:11 +00:00 · 2018-08-20 17:32:42 +01:00
parent a9da8c624d 6a4d5c970d
commit 38766bf2b9
152 changed files with 4814 additions and 274 deletions
--- a/contrib/crosvm/README.md
+++ b/contrib/crosvm/README.md
@@ -30,7 +30,7 @@ YAML file (`minimal.yml`):

 ```
 kernel:
-  image: linuxkit/kernel:4.9.119
+  image: linuxkit/kernel:4.9.120
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
  - linuxkit/init:v0.6
--- a/examples/aws.yml
+++ b/examples/aws.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0"
 init:
  - linuxkit/init:v0.6
--- a/examples/azure.yml
+++ b/examples/azure.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0"
 init:
  - linuxkit/init:v0.6
--- a/examples/cadvisor.yml
+++ b/examples/cadvisor.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
  - linuxkit/init:v0.6
--- a/examples/docker-for-mac.yml
+++ b/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:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0 page_poison=1"
 init:
  - linuxkit/vpnkit-expose-port:v0.6 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
--- a/examples/docker.yml
+++ b/examples/docker.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
  - linuxkit/init:v0.6
--- a/examples/gcp.yml
+++ b/examples/gcp.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0"
 init:
  - linuxkit/init:v0.6
--- a/examples/getty.yml
+++ b/examples/getty.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
  - linuxkit/init:v0.6
--- a/examples/hostmount-writeable-overlay.yml
+++ b/examples/hostmount-writeable-overlay.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
  - linuxkit/init:v0.6
--- a/examples/influxdb-os.yml
+++ b/examples/influxdb-os.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
  - linuxkit/init:v0.6
--- a/examples/logging.yml
+++ b/examples/logging.yml
@@ -1,6 +1,6 @@
 # Simple example of using an external logging service
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
  - linuxkit/init:v0.6
--- a/examples/minimal.yml
+++ b/examples/minimal.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
  - linuxkit/init:v0.6
--- a/examples/node_exporter.yml
+++ b/examples/node_exporter.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=tty0 console=ttyS0"
 init:
  - linuxkit/init:v0.6
--- a/examples/openstack.yml
+++ b/examples/openstack.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0"
 init:
  - linuxkit/init:v0.6
--- a/examples/packet.arm64.yml
+++ b/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:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyAMA0"
  ucode: ""
 onboot:
--- a/examples/packet.yml
+++ b/examples/packet.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: console=ttyS1
  ucode: intel-ucode.cpio
 init:
--- 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.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
  - linuxkit/init:v0.6
--- a/examples/scaleway.yml
+++ b/examples/scaleway.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda"
 init:
  - linuxkit/init:v0.6
--- a/examples/sshd.yml
+++ b/examples/sshd.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
  - linuxkit/init:v0.6
--- a/examples/swap.yml
+++ b/examples/swap.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
 init:
  - linuxkit/init:v0.6
--- a/examples/vmware.yml
+++ b/examples/vmware.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=tty0"
 init:
  - linuxkit/init:v0.6
--- a/examples/vpnkit-forwarder.yml
+++ b/examples/vpnkit-forwarder.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0"
 init:
  - linuxkit/init:v0.6
--- a/examples/vsudd-containerd.yml
+++ b/examples/vsudd-containerd.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0"
 init:
  - linuxkit/init:v0.6
--- a/examples/vultr.yml
+++ b/examples/vultr.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0"
 init:
  - linuxkit/init:v0.6
--- a/examples/wireguard.yml
+++ b/examples/wireguard.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
  - linuxkit/init:v0.6
--- a/kernel/Dockerfile
+++ b/kernel/Dockerfile
@@ -185,7 +185,7 @@ RUN if [ "${KERNEL_SERIES}" != "4.4.x" ] && [ "${KERNEL_SERIES}" != "4.9.x" ]; t
     fi

 # Download Intel ucode and create a CPIO archive for it
-ENV UCODE_URL=https://downloadmirror.intel.com/27776/eng/microcode-20180425.tgz
+ENV UCODE_URL=https://downloadmirror.intel.com/28039/eng/microcode-20180807.tgz
 RUN set -e && \
    if [ $(uname -m) == x86_64 ]; then \
        cd /ucode && \
--- a/kernel/Dockerfile.bcc
+++ b/kernel/Dockerfile.bcc
@@ -35,63 +35,73 @@ RUN ln -s /usr/lib/cmake/llvm5/ /usr/lib/cmake/llvm && \
    ln -s /usr/include/llvm5/llvm/ /usr/include/llvm

 WORKDIR /build
+
 COPY ./bcc.patches/ ./
-RUN mv error.h /usr/include/
-RUN mv cdefs.h /usr/include/sys/
+RUN mv error.h /usr/include/ && \
+    mv cdefs.h /usr/include/sys/
+
 ENV ELFUTILS_VERSION=0.165
 ENV ELFUTILS_SHA256="a7fc9277192caaa5f30b47e8c0518dbcfd8c4a19c6493a63d511d804290ce972"
-RUN curl -sSL -O https://fedorahosted.org/releases/e/l/elfutils/0.165/elfutils-$ELFUTILS_VERSION.tar.bz2
- 
-RUN echo "${ELFUTILS_SHA256}  /build/elfutils-$ELFUTILS_VERSION.tar.bz2" | sha256sum -c - && \
-  tar xjf elfutils-$ELFUTILS_VERSION.tar.bz2 && \
-  cd elfutils-$ELFUTILS_VERSION && \
-  patch -p1 < ../100-musl-compat.patch && \
-  patch -p0 < ../decl.patch && \
-  patch -p0 < ../intl.patch
+RUN curl -sSL -O https://fedorahosted.org/releases/e/l/elfutils/0.165/elfutils-$ELFUTILS_VERSION.tar.bz2 && \
+    echo "${ELFUTILS_SHA256}  /build/elfutils-$ELFUTILS_VERSION.tar.bz2" | sha256sum -c - && \
+    tar xjf elfutils-$ELFUTILS_VERSION.tar.bz2 && \
+    cd elfutils-$ELFUTILS_VERSION && \
+    patch -p1 < ../100-musl-compat.patch && \
+    patch -p0 < ../decl.patch && \
+    patch -p0 < ../intl.patch
+
 ENV BCC_COMMIT=6972806729da00ecda0235abac61d66c8fad7fad
-RUN git clone https://github.com/iovisor/bcc.git && cd bcc && git checkout $BCC_COMMIT
-RUN cd bcc && patch -p0 < ../bcc-gnuism.patch && patch -p0 < ../bcc-lua.patch
+RUN git clone https://github.com/iovisor/bcc.git && \
+    cd bcc && \
+    git checkout $BCC_COMMIT && \
+    patch -p0 < ../bcc-gnuism.patch && patch -p0 < ../bcc-lua.patch
+
 ENV LJSYSCALL_COMMIT=e587f8c55aad3955dddab3a4fa6c1968037b5c6e
-RUN git clone https://github.com/justincormack/ljsyscall.git && cd ljsyscall && git checkout $LJSYSCALL_COMMIT
+RUN git clone https://github.com/justincormack/ljsyscall.git && \
+    cd ljsyscall && \
+    git checkout $LJSYSCALL_COMMIT

 COPY --from=ksrc /kernel-headers.tar /build
-RUN tar xf /build/kernel-headers.tar
-
 COPY --from=ksrc /kernel-dev.tar /build
-RUN tar xf /build/kernel-dev.tar
-
 COPY --from=ksrc /kernel.tar /build
-RUN tar xf /build/kernel.tar
+RUN tar xf /build/kernel-headers.tar && \
+    tar xf /build/kernel-dev.tar && \
+    tar xf /build/kernel.tar

-RUN cd /build
 RUN cd elfutils-$ELFUTILS_VERSION && \
-  aclocal && \
-  automake && \
-  ./configure --prefix=/usr CFLAGS=-Wno-strict-aliasing && \
-  make -C libelf && make -C libelf install
-RUN mkdir -p bcc/build && cd bcc/build && \
-  cmake .. -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_C_FLAGS="-I/build/usr/include" -DCMAKE_CXX_FLAGS="-I/build/usr/include" -DCMAKE_INSTALL_PREFIX=/usr -DLUAJIT_INCLUDE_DIR=/usr/include/luajit-2.1 && \
-  make && \
-  make install
-RUN mkdir -p /usr/local/share/lua/5.1/ && cd ljsyscall && cp -a *.lua syscall /usr/local/share/lua/5.1/
-RUN mkdir -p /out/usr/
-RUN cp -a /build/usr/src /out/usr/
-RUN cp -a /build/usr/include /out/usr
-RUN mkdir -p /out/usr/lib
-RUN cp -a /usr/lib/libelf* /out/usr/lib/
-RUN cp -a /usr/lib/libstdc* /out/usr/lib/
-RUN cp -a /usr/lib/libintl* /out/usr/lib/
-RUN cp -a /usr/lib64/* /out/usr/lib/
-RUN mkdir -p /out/usr/lib/python2.7
-RUN cp -a /usr/lib/python2.7/site-packages /out/usr/lib/python2.7/
-RUN mkdir -p /out/usr/share
-RUN cp -a /usr/share/bcc /out/usr/share/
-RUN mkdir -p /out/usr/bin
-RUN cp -a /usr/bin/bcc-lua /out/usr/bin/
-RUN mkdir -p /out/usr/local/share/
-RUN cp -a /usr/local/share/lua /out/usr/local/share/
+    aclocal && \
+    automake && \
+    ./configure --prefix=/usr CFLAGS=-Wno-strict-aliasing && \
+    make -C libelf && make -C libelf install

-ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib64
+RUN mkdir -p bcc/build && cd bcc/build && \
+    cmake .. -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+             -DCMAKE_C_FLAGS="-I/build/usr/include" \
+             -DCMAKE_CXX_FLAGS="-I/build/usr/include" \
+             -DCMAKE_INSTALL_PREFIX=/usr \
+             -DLUAJIT_INCLUDE_DIR=/usr/include/luajit-2.1 && \
+    make && \
+    make install
+
+RUN mkdir -p /usr/local/share/lua/5.1/ && \
+    cd ljsyscall && \
+    cp -a *.lua syscall /usr/local/share/lua/5.1/
+RUN mkdir -p /out/usr/ && \
+    cp -a /build/usr/src /out/usr/ && \
+    cp -a /build/usr/include /out/usr
+RUN mkdir -p /out/usr/lib && \
+    cp -a /usr/lib/libelf* /out/usr/lib/ && \
+    cp -a /usr/lib/libstdc* /out/usr/lib/ && \
+    cp -a /usr/lib/libintl* /out/usr/lib/ && \
+    cp -a /usr/lib64/* /out/usr/lib/
+RUN mkdir -p /out/usr/lib/python2.7 && \
+    cp -a /usr/lib/python2.7/site-packages /out/usr/lib/python2.7/
+RUN mkdir -p /out/usr/share && \
+    cp -a /usr/share/bcc /out/usr/share/
+RUN mkdir -p /out/usr/bin && \
+    cp -a /usr/bin/bcc-lua /out/usr/bin/
+RUN mkdir -p /out/usr/local/share/ && \
+    cp -a /usr/local/share/lua /out/usr/local/share/

 FROM linuxkit/alpine:8a89682421abf0d886d777235a05f4a04a736df2 as mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
@@ -107,6 +117,6 @@ FROM scratch
 ENTRYPOINT []
 CMD []
 WORKDIR /
+ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib64
 COPY --from=mirror /out /
 COPY --from=build /out /
-
--- a/kernel/Dockerfile.kconfig
+++ b/kernel/Dockerfile.kconfig
@@ -6,7 +6,10 @@ RUN apk add \
    curl \
    diffutils \
    flex \
+    gmp-dev \
    libarchive-tools \
+    mpc1-dev \
+    mpfr-dev \
    ncurses-dev \
    patch \
    xz
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -259,21 +259,22 @@ endef
 # Debug targets only for latest stable and LTS stable
 #
 ifeq ($(ARCH),x86_64)
-$(eval $(call kernel,4.17.14,4.17.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,4.14.62,4.14.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,4.14.62,4.14.x,,-dbg))
+$(eval $(call kernel,4.18.1,4.18.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,4.17.15,4.17.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,4.14.63,4.14.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,4.14.63,4.14.x,,-dbg))
 $(eval $(call kernel,4.14.59,4.14.x,-rt,))
-$(eval $(call kernel,4.9.119,4.9.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,4.4.147,4.4.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,4.9.120,4.9.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,4.4.148,4.4.x,$(EXTRA),$(DEBUG)))

 else ifeq ($(ARCH),aarch64)
-$(eval $(call kernel,4.17.14,4.17.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,4.14.62,4.14.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,4.18.1,4.18.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,4.14.63,4.14.x,$(EXTRA),$(DEBUG)))
 $(eval $(call kernel,4.14.59,4.14.x,-rt,))

 else ifeq ($(ARCH),s390x)
-$(eval $(call kernel,4.17.14,4.17.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,4.14.62,4.14.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,4.18.1,4.18.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,4.14.63,4.14.x,$(EXTRA),$(DEBUG)))
 endif

 # Target for kernel config
--- 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.62 Kernel Configuration
+# Linux/arm64 4.14.63 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
--- a/kernel/config-4.14.x-s390x
+++ b/kernel/config-4.14.x-s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.14.62 Kernel Configuration
+# Linux/s390 4.14.63 Kernel Configuration
 #
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
--- 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.62 Kernel Configuration
+# Linux/x86 4.14.63 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -250,6 +250,7 @@ CONFIG_SLAB_FREELIST_RANDOM=y
 # CONFIG_SYSTEM_DATA_VERIFICATION is not set
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
+CONFIG_HOTPLUG_SMT=y
 CONFIG_OPROFILE=y
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
--- a/kernel/config-4.17.x-x86_64
+++ b/kernel/config-4.17.x-x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.17.14 Kernel Configuration
+# Linux/x86 4.17.15 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -250,6 +250,7 @@ CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
+CONFIG_HOTPLUG_SMT=y
 CONFIG_OPROFILE=y
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
--- a/kernel/config-4.18.x-aarch64
+++ b/kernel/config-4.18.x-aarch64
@@ -1,10 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.17.14 Kernel Configuration
+# Linux/arm64 4.18.1 Kernel Configuration
+#
+
+#
+# Compiler: gcc (Alpine 6.4.0) 6.4.0
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_MMU=y
 CONFIG_ARM64_PAGE_SHIFT=12
 CONFIG_ARM64_CONT_SHIFT=4
@@ -24,18 +27,16 @@ CONFIG_GENERIC_CSUM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ZONE_DMA32=y
 CONFIG_HAVE_GENERIC_GUP=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_SMP=y
-CONFIG_SWIOTLB=y
-CONFIG_IOMMU_HELPER=y
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_PGTABLE_LEVELS=4
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_PROC_KCORE_TEXT=y
 CONFIG_MULTI_IRQ_HANDLER=y
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=60400
+CONFIG_CLANG_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -44,7 +45,6 @@ CONFIG_THREAD_INFO_IN_TASK=y
 # General setup
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION="-linuxkit"
 # CONFIG_LOCALVERSION_AUTO is not set
@@ -129,6 +129,7 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
 CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 CONFIG_MEMCG=y
@@ -242,7 +243,6 @@ CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
-CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
@@ -254,6 +254,7 @@ CONFIG_HAVE_CMPXCHG_DOUBLE=y
 CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
+CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
@@ -263,11 +264,10 @@ CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
 # CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
 CONFIG_GCC_PLUGIN_RANDSTRUCT=y
 CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE=y
-CONFIG_HAVE_CC_STACKPROTECTOR=y
-# CONFIG_CC_STACKPROTECTOR_NONE is not set
-# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
-CONFIG_CC_STACKPROTECTOR_STRONG=y
-# CONFIG_CC_STACKPROTECTOR_AUTO is not set
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
@@ -292,7 +292,6 @@ CONFIG_REFCOUNT_FULL=y
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -421,13 +420,13 @@ CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_PTM is not set
-CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_REALLOC_ENABLE_AUTO=y
 CONFIG_PCI_STUB=y
+# CONFIG_PCI_PF_STUB is not set
 CONFIG_PCI_ATS=y
 CONFIG_PCI_ECAM=y
 CONFIG_PCI_IOV=y
@@ -440,32 +439,33 @@ CONFIG_HOTPLUG_PCI_ACPI=y
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 # CONFIG_HOTPLUG_PCI_SHPC is not set

+#
+# PCI controller drivers
+#
+
 #
 # Cadence PCIe controllers support
 #
 # CONFIG_PCIE_CADENCE_HOST is not set
+# CONFIG_PCI_FTPCI100 is not set
+CONFIG_PCI_HOST_COMMON=y
+CONFIG_PCI_HOST_GENERIC=y
+# CONFIG_PCI_XGENE is not set
+CONFIG_PCI_HOST_THUNDER_PEM=y
+CONFIG_PCI_HOST_THUNDER_ECAM=y

 #
 # DesignWare PCI Core Support
 #
 CONFIG_PCIE_DW=y
 CONFIG_PCIE_DW_HOST=y
-# CONFIG_PCIE_DW_PLAT is not set
+# CONFIG_PCIE_DW_PLAT_HOST is not set
 # CONFIG_PCI_LAYERSCAPE is not set
 CONFIG_PCI_HISI=y
 CONFIG_PCIE_QCOM=y
 # CONFIG_PCIE_KIRIN is not set
 CONFIG_PCIE_HISI_STB=y

-#
-# PCI host controller drivers
-#
-CONFIG_PCI_HOST_COMMON=y
-CONFIG_PCI_HOST_GENERIC=y
-# CONFIG_PCI_XGENE is not set
-CONFIG_PCI_HOST_THUNDER_PEM=y
-CONFIG_PCI_HOST_THUNDER_ECAM=y
-
 #
 # PCI Endpoint
 #
@@ -570,6 +570,7 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_SECCOMP=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
@@ -705,6 +706,7 @@ CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_IPCOMP=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
+CONFIG_XDP_SOCKETS=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
@@ -840,18 +842,15 @@ CONFIG_NF_NAT_SIP=y
 CONFIG_NF_NAT_TFTP=y
 CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NETFILTER_SYNPROXY=y
+CONFIG_NF_OSF=y
 CONFIG_NF_TABLES=y
+# CONFIG_NF_TABLES_SET is not set
 CONFIG_NF_TABLES_INET=y
 CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_EXTHDR=y
-CONFIG_NFT_META=y
-# CONFIG_NFT_RT is not set
 # CONFIG_NFT_NUMGEN is not set
 CONFIG_NFT_CT=y
-# CONFIG_NFT_SET_RBTREE is not set
-# CONFIG_NFT_SET_HASH is not set
-# CONFIG_NFT_SET_BITMAP is not set
 CONFIG_NFT_COUNTER=y
+CONFIG_NFT_CONNLIMIT=y
 CONFIG_NFT_LOG=y
 CONFIG_NFT_LIMIT=y
 CONFIG_NFT_MASQ=y
@@ -864,6 +863,7 @@ CONFIG_NFT_REJECT=y
 CONFIG_NFT_REJECT_INET=y
 CONFIG_NFT_COMPAT=y
 CONFIG_NFT_HASH=y
+# CONFIG_NFT_SOCKET is not set
 CONFIG_NF_DUP_NETDEV=y
 CONFIG_NFT_DUP_NETDEV=y
 CONFIG_NFT_FWD_NETDEV=y
@@ -999,6 +999,7 @@ CONFIG_IP_VS_LBLC=y
 CONFIG_IP_VS_LBLCR=y
 CONFIG_IP_VS_DH=y
 CONFIG_IP_VS_SH=y
+CONFIG_IP_VS_MH=y
 CONFIG_IP_VS_SED=y
 CONFIG_IP_VS_NQ=y

@@ -1007,6 +1008,11 @@ CONFIG_IP_VS_NQ=y
 #
 CONFIG_IP_VS_SH_TAB_BITS=8

+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
 #
 # IPVS application helper
 #
@@ -1020,6 +1026,7 @@ CONFIG_IP_VS_PE_SIP=y
 CONFIG_NF_DEFRAG_IPV4=y
 CONFIG_NF_CONNTRACK_IPV4=y
 # CONFIG_NF_SOCKET_IPV4 is not set
+CONFIG_NF_TPROXY_IPV4=y
 CONFIG_NF_TABLES_IPV4=y
 CONFIG_NFT_CHAIN_ROUTE_IPV4=y
 CONFIG_NFT_REJECT_IPV4=y
@@ -1067,6 +1074,7 @@ CONFIG_IP_NF_ARP_MANGLE=y
 CONFIG_NF_DEFRAG_IPV6=y
 CONFIG_NF_CONNTRACK_IPV6=y
 # CONFIG_NF_SOCKET_IPV6 is not set
+CONFIG_NF_TPROXY_IPV6=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NFT_CHAIN_ROUTE_IPV6=y
 CONFIG_NFT_CHAIN_NAT_IPV6=y
@@ -1102,7 +1110,6 @@ CONFIG_IP6_NF_NAT=y
 CONFIG_IP6_NF_TARGET_MASQUERADE=y
 CONFIG_IP6_NF_TARGET_NPT=y
 CONFIG_NF_TABLES_BRIDGE=y
-CONFIG_NFT_BRIDGE_META=y
 CONFIG_NFT_BRIDGE_REJECT=y
 CONFIG_NF_LOG_BRIDGE=y
 CONFIG_BRIDGE_NF_EBTABLES=y
@@ -1126,6 +1133,8 @@ CONFIG_BRIDGE_EBT_REDIRECT=y
 CONFIG_BRIDGE_EBT_SNAT=y
 CONFIG_BRIDGE_EBT_LOG=y
 CONFIG_BRIDGE_EBT_NFLOG=y
+CONFIG_BPFILTER=y
+CONFIG_BPFILTER_UMH=m
 # CONFIG_IP_DCCP is not set
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
@@ -1302,6 +1311,8 @@ CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 # CONFIG_NET_DEVLINK is not set
 CONFIG_MAY_USE_DEVLINK=y
+CONFIG_PAGE_POOL=y
+CONFIG_FAILOVER=y
 CONFIG_HAVE_EBPF_JIT=y

 #
@@ -1318,9 +1329,13 @@ CONFIG_DEVTMPFS=y
 # CONFIG_DEVTMPFS_MOUNT is not set
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
 CONFIG_FW_LOADER=y
 CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+# CONFIG_FW_LOADER_USER_HELPER is not set
 CONFIG_ALLOW_DEV_COREDUMP=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
@@ -1685,6 +1700,7 @@ CONFIG_DM_CRYPT=y
 CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_THIN_PROVISIONING=y
 # CONFIG_DM_CACHE is not set
+# CONFIG_DM_WRITECACHE is not set
 # CONFIG_DM_ERA is not set
 # CONFIG_DM_MIRROR is not set
 # CONFIG_DM_RAID is not set
@@ -1766,7 +1782,6 @@ CONFIG_NET_VENDOR_AMAZON=y
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_VENDOR_ATHEROS is not set
 # CONFIG_NET_VENDOR_AURORA is not set
-# CONFIG_NET_CADENCE is not set
 CONFIG_NET_VENDOR_BROADCOM=y
 # CONFIG_B44 is not set
 # CONFIG_BCMGENET is not set
@@ -1781,6 +1796,7 @@ CONFIG_BNXT=m
 CONFIG_BNXT_SRIOV=y
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 # CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_CADENCE is not set
 CONFIG_NET_VENDOR_CAVIUM=y
 CONFIG_THUNDER_NIC_PF=m
 CONFIG_THUNDER_NIC_VF=m
@@ -1798,7 +1814,6 @@ CONFIG_NET_VENDOR_CORTINA=y
 # CONFIG_NET_VENDOR_DLINK is not set
 # CONFIG_NET_VENDOR_EMULEX is not set
 # CONFIG_NET_VENDOR_EZCHIP is not set
-# CONFIG_NET_VENDOR_EXAR is not set
 # CONFIG_NET_VENDOR_FREESCALE is not set
 CONFIG_NET_VENDOR_HISILICON=y
 # CONFIG_HIX5HD2_GMAC is not set
@@ -1811,6 +1826,8 @@ CONFIG_HNS_ENET=m
 # CONFIG_HNS3 is not set
 # CONFIG_NET_VENDOR_HP is not set
 CONFIG_NET_VENDOR_HUAWEI=y
+# CONFIG_HINIC is not set
+# CONFIG_NET_VENDOR_I825XX is not set
 CONFIG_NET_VENDOR_INTEL=y
 # CONFIG_E100 is not set
 CONFIG_E1000=m
@@ -1826,7 +1843,7 @@ CONFIG_I40E=m
 CONFIG_I40EVF=m
 CONFIG_ICE=m
 # CONFIG_FM10K is not set
-# CONFIG_NET_VENDOR_I825XX is not set
+# CONFIG_NET_VENDOR_EXAR is not set
 # CONFIG_JME is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
 CONFIG_NET_VENDOR_MELLANOX=y
@@ -1843,6 +1860,8 @@ CONFIG_MLX5_ESWITCH=y
 # CONFIG_MLXSW_CORE is not set
 # CONFIG_MLXFW is not set
 # CONFIG_NET_VENDOR_MICREL is not set
+CONFIG_NET_VENDOR_MICROSEMI=y
+# CONFIG_MSCC_OCELOT_SWITCH is not set
 # CONFIG_NET_VENDOR_MYRI is not set
 # CONFIG_FEALNX is not set
 # CONFIG_NET_VENDOR_NATSEMI is not set
@@ -1854,28 +1873,28 @@ CONFIG_MLX5_ESWITCH=y
 # CONFIG_NET_PACKET_ENGINE is not set
 # CONFIG_NET_VENDOR_QLOGIC is not set
 # CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RDC is not set
 CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_8139CP=m
 # CONFIG_8139TOO is not set
 # CONFIG_R8169 is not set
 # CONFIG_NET_VENDOR_RENESAS is not set
-# CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_ROCKER is not set
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 # CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 # CONFIG_NET_VENDOR_SILAN is not set
 # CONFIG_NET_VENDOR_SIS is not set
-# CONFIG_NET_VENDOR_SOLARFLARE is not set
 # CONFIG_NET_VENDOR_SMSC is not set
 CONFIG_NET_VENDOR_SOCIONEXT=y
 # CONFIG_SNI_NETSEC is not set
 # CONFIG_NET_VENDOR_STMICRO is not set
 # CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_SYNOPSYS is not set
 # CONFIG_NET_VENDOR_TEHUTI is not set
 # CONFIG_NET_VENDOR_TI is not set
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
-# CONFIG_NET_VENDOR_SYNOPSYS is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 # CONFIG_NET_SB1000 is not set
@@ -1887,6 +1906,7 @@ CONFIG_MDIO_BUS=m
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 CONFIG_MDIO_CAVIUM=m
 # CONFIG_MDIO_HISI_FEMAC is not set
+# CONFIG_MDIO_MSCC_MIIM is not set
 # CONFIG_MDIO_OCTEON is not set
 CONFIG_MDIO_THUNDER=m
 CONFIG_PHYLIB=m
@@ -1897,6 +1917,7 @@ CONFIG_SWPHY=y
 #
 # CONFIG_AMD_PHY is not set
 # CONFIG_AQUANTIA_PHY is not set
+# CONFIG_ASIX_PHY is not set
 # CONFIG_AT803X_PHY is not set
 # CONFIG_BCM7XXX_PHY is not set
 # CONFIG_BCM87XX_PHY is not set
@@ -1905,6 +1926,7 @@ CONFIG_SWPHY=y
 # CONFIG_CORTINA_PHY is not set
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_DP83822_PHY is not set
+# CONFIG_DP83TC811_PHY is not set
 # CONFIG_DP83848_PHY is not set
 # CONFIG_DP83867_PHY is not set
 CONFIG_FIXED_PHY=m
@@ -1916,6 +1938,7 @@ CONFIG_FIXED_PHY=m
 # CONFIG_MARVELL_10G_PHY is not set
 # CONFIG_MICREL_PHY is not set
 # CONFIG_MICROCHIP_PHY is not set
+# CONFIG_MICROCHIP_T1_PHY is not set
 # CONFIG_MICROSEMI_PHY is not set
 # CONFIG_NATIONAL_PHY is not set
 # CONFIG_QSEMI_PHY is not set
@@ -1984,6 +2007,7 @@ CONFIG_XEN_NETDEV_FRONTEND=y
 # CONFIG_VMXNET3 is not set
 # CONFIG_FUJITSU_ES is not set
 # CONFIG_NETDEVSIM is not set
+CONFIG_NET_FAILOVER=y
 # CONFIG_ISDN is not set
 # CONFIG_NVM is not set

@@ -2321,6 +2345,7 @@ CONFIG_PTP_1588_CLOCK=y
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
 CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_PINCTRL_AMD is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
@@ -2347,6 +2372,7 @@ CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_EXYNOS=y
 CONFIG_PINCTRL_EXYNOS_ARM64=y
 CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_OF_GPIO=y
 CONFIG_GPIO_ACPI=y
 CONFIG_GPIOLIB_IRQCHIP=y
@@ -2732,6 +2758,7 @@ CONFIG_MFD_VEXPRESS_SYSREG=y
 #
 # AMD Library routines
 #
+# CONFIG_DRM_XEN is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y

 #
@@ -2792,7 +2819,6 @@ CONFIG_XEN_FBDEV_FRONTEND=y
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_AUO_K190X is not set
 CONFIG_FB_SIMPLE=y
 # CONFIG_FB_SSD1307 is not set
 # CONFIG_FB_SM712 is not set
@@ -2857,6 +2883,7 @@ CONFIG_HID_GENERIC=y
 # CONFIG_HID_LOGITECH is not set
 # CONFIG_HID_MAGICMOUSE is not set
 # CONFIG_HID_MAYFLASH is not set
+# CONFIG_HID_REDRAGON is not set
 # CONFIG_HID_MICROSOFT is not set
 # CONFIG_HID_MONTEREY is not set
 # CONFIG_HID_MULTITOUCH is not set
@@ -2874,6 +2901,7 @@ CONFIG_HID_GENERIC=y
 # CONFIG_HID_SAITEK is not set
 # CONFIG_HID_SAMSUNG is not set
 # CONFIG_HID_SPEEDLINK is not set
+# CONFIG_HID_STEAM is not set
 # CONFIG_HID_STEELSERIES is not set
 # CONFIG_HID_SUNPLUS is not set
 # CONFIG_HID_RMI is not set
@@ -3368,6 +3396,8 @@ CONFIG_RASPBERRYPI_POWER=y
 #
 # Qualcomm SoC drivers
 #
+# CONFIG_QCOM_COMMAND_DB is not set
+# CONFIG_QCOM_GENI_SE is not set
 # CONFIG_QCOM_GSBI is not set
 # CONFIG_QCOM_RMTFS_MEM is not set
 CONFIG_SOC_SAMSUNG=y
@@ -3566,6 +3596,7 @@ CONFIG_PMIC_OPREGION=y
 CONFIG_ACPI_CONFIGFS=y
 CONFIG_ACPI_IORT=y
 CONFIG_ACPI_GTDT=y
+CONFIG_ACPI_PPTT=y

 #
 # File systems
@@ -3623,6 +3654,7 @@ CONFIG_PRINT_QUOTA_WARNING=y
 # CONFIG_QFMT_V2 is not set
 CONFIG_QUOTACTL=y
 # CONFIG_AUTOFS4_FS is not set
+# CONFIG_AUTOFS_FS is not set
 CONFIG_FUSE_FS=y
 CONFIG_CUSE=y
 CONFIG_OVERLAY_FS=y
@@ -3650,7 +3682,6 @@ CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=y
-CONFIG_UDF_NLS=y

 #
 # DOS/FAT/NT Filesystems
@@ -3680,6 +3711,7 @@ CONFIG_TMPFS=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
+CONFIG_MEMFD_CREATE=y
 CONFIG_CONFIGFS_FS=y
 CONFIG_EFIVAR_FS=y
 CONFIG_MISC_FILESYSTEMS=y
@@ -3851,6 +3883,7 @@ CONFIG_KVM_VFIO=y
 CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
 CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
 CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
 CONFIG_KVM_ARM_HOST=y
@@ -3924,6 +3957,7 @@ CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_HAVE_ARCH_KASAN=y
 # CONFIG_KASAN is not set
 CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
 # CONFIG_DEBUG_SHIRQ is not set

@@ -4046,6 +4080,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_UUID is not set
+# CONFIG_TEST_OVERFLOW is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_LKM is not set
@@ -4066,7 +4101,6 @@ CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 CONFIG_UBSAN=y
 # CONFIG_UBSAN_SANITIZE_ALL is not set
 # CONFIG_UBSAN_ALIGNMENT is not set
-# CONFIG_UBSAN_NULL is not set
 # CONFIG_TEST_UBSAN is not set
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 CONFIG_STRICT_DEVMEM=y
@@ -4129,6 +4163,7 @@ CONFIG_IMA_APPRAISE=y
 CONFIG_IMA_APPRAISE_BOOTPARAM=y
 CONFIG_EVM=y
 CONFIG_EVM_ATTR_FSUUID=y
+# CONFIG_EVM_ADD_XATTRS is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_DEFAULT_SECURITY=""
 CONFIG_XOR_BLOCKS=m
@@ -4178,6 +4213,11 @@ CONFIG_CRYPTO_ENGINE=m
 CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_CHACHA20POLY1305=y
+# CONFIG_CRYPTO_AEGIS128 is not set
+# CONFIG_CRYPTO_AEGIS128L is not set
+# CONFIG_CRYPTO_AEGIS256 is not set
+# CONFIG_CRYPTO_MORUS640 is not set
+# CONFIG_CRYPTO_MORUS1280 is not set
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_ECHAINIV=y

@@ -4259,6 +4299,7 @@ CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_LZ4=y
 CONFIG_CRYPTO_LZ4HC=y
+# CONFIG_CRYPTO_ZSTD is not set

 #
 # Random Number Generation
@@ -4305,6 +4346,7 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=y
 # CONFIG_CRYPTO_SHA512_ARM64_CE is not set
 # CONFIG_CRYPTO_SHA3_ARM64 is not set
 # CONFIG_CRYPTO_SM3_ARM64_CE is not set
+# CONFIG_CRYPTO_SM4_ARM64_CE is not set
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
 CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y
 CONFIG_CRYPTO_CRC32_ARM64_CE=y
@@ -4330,6 +4372,7 @@ CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 # CONFIG_INDIRECT_PIO is not set
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
@@ -4380,8 +4423,13 @@ CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
-CONFIG_SGL_ALLOC=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_DMA_DIRECT_OPS=y
+CONFIG_SWIOTLB=y
+CONFIG_SGL_ALLOC=y
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
--- a/kernel/config-4.18.x-s390x
+++ b/kernel/config-4.18.x-s390x
@@ -1,6 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.17.14 Kernel Configuration
+# Linux/s390 4.18.1 Kernel Configuration
+#
+
+#
+# Compiler: gcc (Alpine 6.4.0) 6.4.0
 #
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
@@ -11,7 +15,6 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_PGSTE=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_AUDIT_ARCH=y
@@ -21,6 +24,9 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_S390=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_PGTABLE_LEVELS=5
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=60400
+CONFIG_CLANG_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -29,7 +35,6 @@ CONFIG_THREAD_INFO_IN_TASK=y
 # General setup
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION="-linuxkit"
 # CONFIG_LOCALVERSION_AUTO is not set
@@ -185,6 +190,8 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 # CONFIG_USERFAULTFD is not set
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
 # CONFIG_PC104 is not set
@@ -224,7 +231,7 @@ CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_RSEQ=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
@@ -236,15 +243,8 @@ CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
-CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
-# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
-CONFIG_GCC_PLUGIN_STRUCTLEAK=y
-CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set
-CONFIG_GCC_PLUGIN_RANDSTRUCT=y
-CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE=y
+CONFIG_PLUGIN_HOSTCC="g++"
+CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y
 CONFIG_ARCH_HAS_SCALED_CPUTIME=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
@@ -258,6 +258,7 @@ CONFIG_CLONE_BACKWARDS2=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OLD_SIGACTION=y
 CONFIG_COMPAT_OLD_SIGACTION=y
+CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_KERNEL_RWX=y
 CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
@@ -506,6 +507,7 @@ CONFIG_CMA_AREAS=7
 # CONFIG_IDLE_PAGE_TRACKING is not set
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_MAX_PHYSMEM_BITS=46
 CONFIG_PACK_STACK=y
 CONFIG_CHECK_STACK=y
@@ -529,11 +531,11 @@ CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_PTM is not set
-CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_MSI=y
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
 CONFIG_PCI_STUB=y
+# CONFIG_PCI_PF_STUB is not set
 CONFIG_PCI_ATS=y
 CONFIG_PCI_IOV=y
 CONFIG_PCI_PRI=y
@@ -543,6 +545,10 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HOTPLUG_PCI_SHPC is not set
 # CONFIG_HOTPLUG_PCI_S390 is not set

+#
+# PCI controller drivers
+#
+
 #
 # Cadence PCIe controllers support
 #
@@ -551,10 +557,6 @@ CONFIG_HOTPLUG_PCI=y
 # DesignWare PCI Core Support
 #

-#
-# PCI host controller drivers
-#
-
 #
 # PCI Endpoint
 #
@@ -566,9 +568,6 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_PCI_SW_SWITCHTEC is not set
 CONFIG_PCI_DOMAINS=y
 CONFIG_HAS_IOMEM=y
-CONFIG_IOMMU_HELPER=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_CHSC_SCH=m
 CONFIG_SCM_BUS=y
 CONFIG_EADM_SCH=m
@@ -622,6 +621,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_IUCV=y
 CONFIG_AFIUCV=m
+CONFIG_XDP_SOCKETS=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
@@ -757,18 +757,15 @@ CONFIG_NF_NAT_SIP=y
 CONFIG_NF_NAT_TFTP=y
 CONFIG_NF_NAT_REDIRECT=y
 CONFIG_NETFILTER_SYNPROXY=y
+CONFIG_NF_OSF=y
 CONFIG_NF_TABLES=y
+# CONFIG_NF_TABLES_SET is not set
 CONFIG_NF_TABLES_INET=y
 CONFIG_NF_TABLES_NETDEV=y
-CONFIG_NFT_EXTHDR=y
-CONFIG_NFT_META=y
-# CONFIG_NFT_RT is not set
 # CONFIG_NFT_NUMGEN is not set
 CONFIG_NFT_CT=y
-# CONFIG_NFT_SET_RBTREE is not set
-# CONFIG_NFT_SET_HASH is not set
-# CONFIG_NFT_SET_BITMAP is not set
 CONFIG_NFT_COUNTER=y
+CONFIG_NFT_CONNLIMIT=y
 CONFIG_NFT_LOG=y
 CONFIG_NFT_LIMIT=y
 CONFIG_NFT_MASQ=y
@@ -781,6 +778,7 @@ CONFIG_NFT_REJECT=y
 CONFIG_NFT_REJECT_INET=y
 CONFIG_NFT_COMPAT=y
 CONFIG_NFT_HASH=y
+# CONFIG_NFT_SOCKET is not set
 CONFIG_NF_DUP_NETDEV=y
 CONFIG_NFT_DUP_NETDEV=y
 CONFIG_NFT_FWD_NETDEV=y
@@ -916,6 +914,7 @@ CONFIG_IP_VS_LBLC=y
 CONFIG_IP_VS_LBLCR=y
 CONFIG_IP_VS_DH=y
 CONFIG_IP_VS_SH=y
+CONFIG_IP_VS_MH=y
 CONFIG_IP_VS_SED=y
 CONFIG_IP_VS_NQ=y

@@ -924,6 +923,11 @@ CONFIG_IP_VS_NQ=y
 #
 CONFIG_IP_VS_SH_TAB_BITS=8

+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
 #
 # IPVS application helper
 #
@@ -937,6 +941,7 @@ CONFIG_IP_VS_NFCT=y
 CONFIG_NF_DEFRAG_IPV4=y
 CONFIG_NF_CONNTRACK_IPV4=y
 # CONFIG_NF_SOCKET_IPV4 is not set
+CONFIG_NF_TPROXY_IPV4=y
 CONFIG_NF_TABLES_IPV4=y
 CONFIG_NFT_CHAIN_ROUTE_IPV4=y
 CONFIG_NFT_REJECT_IPV4=y
@@ -984,6 +989,7 @@ CONFIG_IP_NF_ARP_MANGLE=y
 CONFIG_NF_DEFRAG_IPV6=y
 CONFIG_NF_CONNTRACK_IPV6=y
 # CONFIG_NF_SOCKET_IPV6 is not set
+CONFIG_NF_TPROXY_IPV6=y
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NFT_CHAIN_ROUTE_IPV6=y
 CONFIG_NFT_CHAIN_NAT_IPV6=y
@@ -1019,7 +1025,6 @@ CONFIG_IP6_NF_NAT=y
 CONFIG_IP6_NF_TARGET_MASQUERADE=y
 CONFIG_IP6_NF_TARGET_NPT=y
 CONFIG_NF_TABLES_BRIDGE=y
-CONFIG_NFT_BRIDGE_META=y
 CONFIG_NFT_BRIDGE_REJECT=y
 CONFIG_NF_LOG_BRIDGE=y
 CONFIG_BRIDGE_NF_EBTABLES=y
@@ -1043,6 +1048,8 @@ CONFIG_BRIDGE_EBT_REDIRECT=y
 CONFIG_BRIDGE_EBT_SNAT=y
 CONFIG_BRIDGE_EBT_LOG=y
 CONFIG_BRIDGE_EBT_NFLOG=y
+CONFIG_BPFILTER=y
+CONFIG_BPFILTER_UMH=m
 # CONFIG_IP_DCCP is not set
 CONFIG_IP_SCTP=m
 # CONFIG_SCTP_DBG_OBJCNT is not set
@@ -1212,6 +1219,8 @@ CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 # CONFIG_NET_DEVLINK is not set
 CONFIG_MAY_USE_DEVLINK=y
+CONFIG_PAGE_POOL=y
+CONFIG_FAILOVER=y
 CONFIG_HAVE_EBPF_JIT=y
 CONFIG_CCW=y

@@ -1228,9 +1237,13 @@ CONFIG_DEVTMPFS=y
 # CONFIG_DEVTMPFS_MOUNT is not set
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
 CONFIG_FW_LOADER=y
 CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+# CONFIG_FW_LOADER_USER_HELPER is not set
 CONFIG_ALLOW_DEV_COREDUMP=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
@@ -1554,6 +1567,7 @@ CONFIG_DM_CRYPT=y
 CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_THIN_PROVISIONING=y
 # CONFIG_DM_CACHE is not set
+# CONFIG_DM_WRITECACHE is not set
 # CONFIG_DM_ERA is not set
 # CONFIG_DM_MIRROR is not set
 # CONFIG_DM_RAID is not set
@@ -1624,9 +1638,9 @@ CONFIG_ETHERNET=y
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_VENDOR_ATHEROS is not set
 # CONFIG_NET_VENDOR_AURORA is not set
-# CONFIG_NET_CADENCE is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
 # CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_CADENCE is not set
 # CONFIG_NET_VENDOR_CAVIUM is not set
 # CONFIG_NET_VENDOR_CHELSIO is not set
 # CONFIG_NET_VENDOR_CISCO is not set
@@ -1636,10 +1650,10 @@ CONFIG_ETHERNET=y
 # CONFIG_NET_VENDOR_DLINK is not set
 # CONFIG_NET_VENDOR_EMULEX is not set
 # CONFIG_NET_VENDOR_EZCHIP is not set
-# CONFIG_NET_VENDOR_EXAR is not set
 # CONFIG_NET_VENDOR_HP is not set
 # CONFIG_NET_VENDOR_HUAWEI is not set
 # CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_EXAR is not set
 # CONFIG_JME is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
 CONFIG_NET_VENDOR_MELLANOX=y
@@ -1656,6 +1670,8 @@ CONFIG_MLX5_ESWITCH=y
 # CONFIG_MLXSW_CORE is not set
 # CONFIG_MLXFW is not set
 # CONFIG_NET_VENDOR_MICREL is not set
+CONFIG_NET_VENDOR_MICROSEMI=y
+# CONFIG_MSCC_OCELOT_SWITCH is not set
 # CONFIG_NET_VENDOR_MYRI is not set
 # CONFIG_FEALNX is not set
 # CONFIG_NET_VENDOR_NATSEMI is not set
@@ -1667,29 +1683,30 @@ CONFIG_NET_VENDOR_NI=y
 # CONFIG_NET_PACKET_ENGINE is not set
 # CONFIG_NET_VENDOR_QLOGIC is not set
 # CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_REALTEK is not set
 # CONFIG_NET_VENDOR_RENESAS is not set
-# CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_ROCKER is not set
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 # CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
 # CONFIG_NET_VENDOR_SILAN is not set
 # CONFIG_NET_VENDOR_SIS is not set
-# CONFIG_NET_VENDOR_SOLARFLARE is not set
 # CONFIG_NET_VENDOR_SMSC is not set
 # CONFIG_NET_VENDOR_SOCIONEXT is not set
 # CONFIG_NET_VENDOR_STMICRO is not set
 # CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_SYNOPSYS is not set
 # CONFIG_NET_VENDOR_TEHUTI is not set
 # CONFIG_NET_VENDOR_TI is not set
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
-# CONFIG_NET_VENDOR_SYNOPSYS is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 CONFIG_MDIO_DEVICE=m
 CONFIG_MDIO_BUS=m
 # CONFIG_MDIO_BITBANG is not set
+# CONFIG_MDIO_MSCC_MIIM is not set
 # CONFIG_MDIO_THUNDER is not set
 CONFIG_PHYLIB=m

@@ -1698,6 +1715,7 @@ CONFIG_PHYLIB=m
 #
 # CONFIG_AMD_PHY is not set
 # CONFIG_AQUANTIA_PHY is not set
+# CONFIG_ASIX_PHY is not set
 # CONFIG_AT803X_PHY is not set
 # CONFIG_BCM7XXX_PHY is not set
 # CONFIG_BCM87XX_PHY is not set
@@ -1706,6 +1724,7 @@ CONFIG_PHYLIB=m
 # CONFIG_CORTINA_PHY is not set
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_DP83822_PHY is not set
+# CONFIG_DP83TC811_PHY is not set
 # CONFIG_DP83848_PHY is not set
 # CONFIG_DP83867_PHY is not set
 # CONFIG_FIXED_PHY is not set
@@ -1717,6 +1736,7 @@ CONFIG_PHYLIB=m
 # CONFIG_MARVELL_10G_PHY is not set
 # CONFIG_MICREL_PHY is not set
 # CONFIG_MICROCHIP_PHY is not set
+# CONFIG_MICROCHIP_T1_PHY is not set
 # CONFIG_MICROSEMI_PHY is not set
 # CONFIG_NATIONAL_PHY is not set
 # CONFIG_QSEMI_PHY is not set
@@ -1765,6 +1785,7 @@ CONFIG_CCWGROUP=y
 # CONFIG_WAN is not set
 # CONFIG_VMXNET3 is not set
 # CONFIG_NETDEVSIM is not set
+CONFIG_NET_FAILOVER=y
 # CONFIG_NVM is not set

 #
@@ -2317,7 +2338,6 @@ CONFIG_FB_NOTIFY=y
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_BROADSHEET is not set
-# CONFIG_FB_AUO_K190X is not set
 # CONFIG_FB_SIMPLE is not set
 # CONFIG_FB_SM712 is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
@@ -2373,6 +2393,7 @@ CONFIG_HID_GENERIC=y
 # CONFIG_HID_LOGITECH is not set
 # CONFIG_HID_MAGICMOUSE is not set
 # CONFIG_HID_MAYFLASH is not set
+# CONFIG_HID_REDRAGON is not set
 # CONFIG_HID_MICROSOFT is not set
 # CONFIG_HID_MONTEREY is not set
 # CONFIG_HID_MULTITOUCH is not set
@@ -2386,6 +2407,7 @@ CONFIG_HID_GENERIC=y
 # CONFIG_HID_SAITEK is not set
 # CONFIG_HID_SAMSUNG is not set
 # CONFIG_HID_SPEEDLINK is not set
+# CONFIG_HID_STEAM is not set
 # CONFIG_HID_STEELSERIES is not set
 # CONFIG_HID_SUNPLUS is not set
 # CONFIG_HID_RMI is not set
@@ -2563,6 +2585,7 @@ CONFIG_DAX=y
 CONFIG_PM_OPP=y
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
+CONFIG_HAVE_PNETID=y

 #
 # File systems
@@ -2619,6 +2642,7 @@ CONFIG_PRINT_QUOTA_WARNING=y
 # CONFIG_QFMT_V2 is not set
 CONFIG_QUOTACTL=y
 # CONFIG_AUTOFS4_FS is not set
+# CONFIG_AUTOFS_FS is not set
 CONFIG_FUSE_FS=y
 CONFIG_CUSE=y
 CONFIG_OVERLAY_FS=y
@@ -2646,7 +2670,6 @@ CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
 CONFIG_UDF_FS=y
-CONFIG_UDF_NLS=y

 #
 # DOS/FAT/NT Filesystems
@@ -2676,6 +2699,7 @@ CONFIG_TMPFS=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
+CONFIG_MEMFD_CREATE=y
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
 # CONFIG_CONFIGFS_FS is not set
 CONFIG_MISC_FILESYSTEMS=y
@@ -2893,6 +2917,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
 # CONFIG_DEBUG_SHIRQ is not set

@@ -3011,6 +3036,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
 # CONFIG_TEST_UUID is not set
+# CONFIG_TEST_OVERFLOW is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_LKM is not set
@@ -3026,11 +3052,9 @@ CONFIG_RUNTIME_TESTING_MENU=y
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 # CONFIG_SAMPLES is not set
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
-CONFIG_ARCH_WANTS_UBSAN_NO_NULL=y
 CONFIG_UBSAN=y
 # CONFIG_UBSAN_SANITIZE_ALL is not set
 # CONFIG_UBSAN_ALIGNMENT is not set
-# CONFIG_UBSAN_NULL is not set
 # CONFIG_TEST_UBSAN is not set
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 CONFIG_STRICT_DEVMEM=y
@@ -3088,6 +3112,7 @@ CONFIG_IMA_APPRAISE=y
 CONFIG_IMA_APPRAISE_BOOTPARAM=y
 CONFIG_EVM=y
 CONFIG_EVM_ATTR_FSUUID=y
+# CONFIG_EVM_ADD_XATTRS is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
 CONFIG_DEFAULT_SECURITY=""
 CONFIG_XOR_BLOCKS=m
@@ -3136,6 +3161,11 @@ CONFIG_CRYPTO_ENGINE=m
 CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_CHACHA20POLY1305=y
+# CONFIG_CRYPTO_AEGIS128 is not set
+# CONFIG_CRYPTO_AEGIS128L is not set
+# CONFIG_CRYPTO_AEGIS256 is not set
+# CONFIG_CRYPTO_MORUS640 is not set
+# CONFIG_CRYPTO_MORUS1280 is not set
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_ECHAINIV=y

@@ -3217,6 +3247,7 @@ CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_842=y
 CONFIG_CRYPTO_LZ4=y
 CONFIG_CRYPTO_LZ4HC=y
+# CONFIG_CRYPTO_ZSTD is not set

 #
 # Random Number Generation
@@ -3310,8 +3341,12 @@ CONFIG_TEXTSEARCH_FSM=y
 CONFIG_RADIX_TREE_MULTIORDER=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_DMA=y
-CONFIG_SGL_ALLOC=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_DMA_DIRECT_OPS=y
+CONFIG_SGL_ALLOC=y
+CONFIG_IOMMU_HELPER=y
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
--- a/kernel/config-4.18.x-x86_64
+++ b/kernel/config-4.18.x-x86_64
--- 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.147 Kernel Configuration
+# Linux/x86 4.4.148 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
--- 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.119 Kernel Configuration
+# Linux/x86 4.9.120 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -241,6 +241,7 @@ CONFIG_SLAB_FREELIST_RANDOM=y
 # CONFIG_SYSTEM_DATA_VERIFICATION is not set
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
+CONFIG_HOTPLUG_SMT=y
 CONFIG_OPROFILE=y
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
--- 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 6bf940c4a1e4950afbdb9769e05ead23ad95f69a Mon Sep 17 00:00:00 2001
+From 1eac439963ea0387a71e2f227a18a3e3de24cfdc Mon Sep 17 00:00:00 2001
 From: Cheng-mean Liu <soccerl@microsoft.com>
 Date: Tue, 11 Jul 2017 16:58:26 -0700
 Subject: [PATCH 01/21] NVDIMM: reducded ND_MIN_NAMESPACE_SIZE from 4MB to 4KB
--- a/kernel/patches-4.14.x/0002-hyper-v-trace-vmbus_on_msg_dpc.patch
+++ b/kernel/patches-4.14.x/0002-hyper-v-trace-vmbus_on_msg_dpc.patch
@@ -1,4 +1,4 @@
-From 39eeba58d1ce2422b2f7bb87aa3608cb93f91c1b Mon Sep 17 00:00:00 2001
+From c897ba945377b8dfd80c82b289d3418c1a71f87c Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Sun, 29 Oct 2017 12:21:00 -0700
 Subject: [PATCH 02/21] hyper-v: trace vmbus_on_msg_dpc()
--- a/kernel/patches-4.14.x/0003-hyper-v-trace-vmbus_on_message.patch
+++ b/kernel/patches-4.14.x/0003-hyper-v-trace-vmbus_on_message.patch
@@ -1,4 +1,4 @@
-From 2e8defad92a8901647aa510dfcb6eeed53801d0f Mon Sep 17 00:00:00 2001
+From a8dbf919efefd4b2c2eaa558b873b574a5bad9af Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Sun, 29 Oct 2017 12:21:01 -0700
 Subject: [PATCH 03/21] hyper-v: trace vmbus_on_message()
--- a/kernel/patches-4.14.x/0004-hyper-v-trace-vmbus_onoffer.patch
+++ b/kernel/patches-4.14.x/0004-hyper-v-trace-vmbus_onoffer.patch
@@ -1,4 +1,4 @@
-From 6ce87087e9413ea72efc9c586087039f2532f82c Mon Sep 17 00:00:00 2001
+From d02493565c577a03417c8e3d907e46a8413b8cbb Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Sun, 29 Oct 2017 12:21:02 -0700
 Subject: [PATCH 04/21] hyper-v: trace vmbus_onoffer()
--- a/kernel/patches-4.14.x/0005-hyper-v-trace-vmbus_onoffer_rescind.patch
+++ b/kernel/patches-4.14.x/0005-hyper-v-trace-vmbus_onoffer_rescind.patch
@@ -1,4 +1,4 @@
-From 8209e6484e5ad8090888add781d56af201898bc8 Mon Sep 17 00:00:00 2001
+From 4f9df76c876c4ad6c9ab30ea3bb4c72657fc7ec5 Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Sun, 29 Oct 2017 12:21:03 -0700
 Subject: [PATCH 05/21] hyper-v: trace vmbus_onoffer_rescind()
--- a/kernel/patches-4.14.x/0006-hyper-v-trace-vmbus_onopen_result.patch
+++ b/kernel/patches-4.14.x/0006-hyper-v-trace-vmbus_onopen_result.patch
@@ -1,4 +1,4 @@
-From a79892650a6d739cca5e3cfdc80276fe43e0f4ab Mon Sep 17 00:00:00 2001
+From f2c44a942ccf5fdd1e882524d15be039c44b26d9 Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Sun, 29 Oct 2017 12:21:04 -0700
 Subject: [PATCH 06/21] hyper-v: trace vmbus_onopen_result()
--- a/kernel/patches-4.14.x/0007-hyper-v-trace-vmbus_ongpadl_created.patch
+++ b/kernel/patches-4.14.x/0007-hyper-v-trace-vmbus_ongpadl_created.patch
@@ -1,4 +1,4 @@
-From a44fdd5b7e46c1f0e34a8baa5ca01380deb5acbb Mon Sep 17 00:00:00 2001
+From 224758bbc0d11f7c343a6fe02a68abed62bd99c8 Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Sun, 29 Oct 2017 12:21:05 -0700
 Subject: [PATCH 07/21] hyper-v: trace vmbus_ongpadl_created()
--- a/kernel/patches-4.14.x/0008-hyper-v-trace-vmbus_ongpadl_torndown.patch
+++ b/kernel/patches-4.14.x/0008-hyper-v-trace-vmbus_ongpadl_torndown.patch
@@ -1,4 +1,4 @@
-From cb106cc0803b9a4e2e19e0942b1ac1b511914d9f Mon Sep 17 00:00:00 2001
+From 87674d325b1b1bd344a708ea1e2130a430842418 Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Sun, 29 Oct 2017 12:21:06 -0700
 Subject: [PATCH 08/21] hyper-v: trace vmbus_ongpadl_torndown()
--- a/kernel/patches-4.14.x/0009-hyper-v-trace-vmbus_onversion_response.patch
+++ b/kernel/patches-4.14.x/0009-hyper-v-trace-vmbus_onversion_response.patch
@@ -1,4 +1,4 @@
-From d07a78fc089ea9025331aa0971790d04dc891596 Mon Sep 17 00:00:00 2001
+From 15037ab1438508bd7482731b99256b4fb657057f Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Sun, 29 Oct 2017 12:21:07 -0700
 Subject: [PATCH 09/21] hyper-v: trace vmbus_onversion_response()
--- a/kernel/patches-4.14.x/0010-hyper-v-trace-vmbus_request_offers.patch
+++ b/kernel/patches-4.14.x/0010-hyper-v-trace-vmbus_request_offers.patch
@@ -1,4 +1,4 @@
-From bcb71d3da501ab49e8de5a01469e3c4e3c79af7c Mon Sep 17 00:00:00 2001
+From 3c315e0d6ac666fb4b5201048e245120f594ac9e Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Sun, 29 Oct 2017 12:21:08 -0700
 Subject: [PATCH 10/21] hyper-v: trace vmbus_request_offers()
--- a/kernel/patches-4.14.x/0011-hyper-v-trace-vmbus_open.patch
+++ b/kernel/patches-4.14.x/0011-hyper-v-trace-vmbus_open.patch
@@ -1,4 +1,4 @@
-From c729bb25750d57541d60f09497ac36a9e8ff4982 Mon Sep 17 00:00:00 2001
+From 2ce7c7a606f783cf2a7bdf30e947e5ef2309b878 Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Sun, 29 Oct 2017 12:21:09 -0700
 Subject: [PATCH 11/21] hyper-v: trace vmbus_open()
--- a/kernel/patches-4.14.x/0012-hyper-v-trace-vmbus_close_internal.patch
+++ b/kernel/patches-4.14.x/0012-hyper-v-trace-vmbus_close_internal.patch
@@ -1,4 +1,4 @@
-From 2589cc41027085975a749ddf238267f760105b30 Mon Sep 17 00:00:00 2001
+From f462358f6edae8db08241026e05ec2bd92db6eb7 Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Sun, 29 Oct 2017 12:21:10 -0700
 Subject: [PATCH 12/21] hyper-v: trace vmbus_close_internal()
--- a/kernel/patches-4.14.x/0013-hyper-v-trace-vmbus_establish_gpadl.patch
+++ b/kernel/patches-4.14.x/0013-hyper-v-trace-vmbus_establish_gpadl.patch
@@ -1,4 +1,4 @@
-From 46cdaccb0a9de1b9ebf36161b652e43cbd1d6fd9 Mon Sep 17 00:00:00 2001
+From 2cd2b920517f035dfb6791130f7312dc99d398cf Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Sun, 29 Oct 2017 12:21:11 -0700
 Subject: [PATCH 13/21] hyper-v: trace vmbus_establish_gpadl()
--- a/kernel/patches-4.14.x/0014-hyper-v-trace-vmbus_teardown_gpadl.patch
+++ b/kernel/patches-4.14.x/0014-hyper-v-trace-vmbus_teardown_gpadl.patch
@@ -1,4 +1,4 @@
-From 1f79bca0f43a1708cae1bfac8e3a766891bc5f74 Mon Sep 17 00:00:00 2001
+From d317b85aef2e58c8172e2d09875cb16d9aa5e464 Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Sun, 29 Oct 2017 12:21:12 -0700
 Subject: [PATCH 14/21] hyper-v: trace vmbus_teardown_gpadl()
--- a/kernel/patches-4.14.x/0015-hyper-v-trace-vmbus_negotiate_version.patch
+++ b/kernel/patches-4.14.x/0015-hyper-v-trace-vmbus_negotiate_version.patch
@@ -1,4 +1,4 @@
-From ba4b0a8ad1464bad30d3e4bc3ec808a4af19c477 Mon Sep 17 00:00:00 2001
+From 82194d074370efd2b2a6c550cbe7050dd932b136 Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Sun, 29 Oct 2017 12:21:13 -0700
 Subject: [PATCH 15/21] hyper-v: trace vmbus_negotiate_version()
--- a/kernel/patches-4.14.x/0016-hyper-v-trace-vmbus_release_relid.patch
+++ b/kernel/patches-4.14.x/0016-hyper-v-trace-vmbus_release_relid.patch
@@ -1,4 +1,4 @@
-From 3ad32115332ce7874ff20459b658244c90ef8fe5 Mon Sep 17 00:00:00 2001
+From 1e482a1d72f7e49376ea6204b74728b9bd748a21 Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Sun, 29 Oct 2017 12:21:14 -0700
 Subject: [PATCH 16/21] hyper-v: trace vmbus_release_relid()
--- a/kernel/patches-4.14.x/0017-hyper-v-trace-vmbus_send_tl_connect_request.patch
+++ b/kernel/patches-4.14.x/0017-hyper-v-trace-vmbus_send_tl_connect_request.patch
@@ -1,4 +1,4 @@
-From e96e858d60f00b0ca359006ce7ae82e8547da2bc Mon Sep 17 00:00:00 2001
+From 2419f4c888f25e843f3a67fa15e9cef6586c354c Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Sun, 29 Oct 2017 12:21:15 -0700
 Subject: [PATCH 17/21] hyper-v: trace vmbus_send_tl_connect_request()
--- a/kernel/patches-4.14.x/0018-hyper-v-trace-channel-events.patch
+++ b/kernel/patches-4.14.x/0018-hyper-v-trace-channel-events.patch
@@ -1,4 +1,4 @@
-From 41b7b92d8df2160e84615d1badd5b06fdb2e4b7d Mon Sep 17 00:00:00 2001
+From 889530d689cd56435d7201ed2e82c80c3cc40715 Mon Sep 17 00:00:00 2001
 From: Vitaly Kuznetsov <vkuznets@redhat.com>
 Date: Sun, 29 Oct 2017 12:21:16 -0700
 Subject: [PATCH 18/21] hyper-v: trace channel events
--- a/kernel/patches-4.14.x/0019-serial-forbid-8250-on-s390.patch
+++ b/kernel/patches-4.14.x/0019-serial-forbid-8250-on-s390.patch
@@ -1,4 +1,4 @@
-From a16cb269ded032de9550000c54bc0c5dcc778621 Mon Sep 17 00:00:00 2001
+From fd47a72ca77043a324da9e1cd3d5f4cad46fd35b Mon Sep 17 00:00:00 2001
 From: Christian Borntraeger <borntraeger@de.ibm.com>
 Date: Tue, 12 Dec 2017 09:08:35 +0100
 Subject: [PATCH 19/21] serial: forbid 8250 on s390
--- a/kernel/patches-4.14.x/0020-scsi-storvsc-Allow-only-one-remove-lun-work-item-to-.patch
+++ b/kernel/patches-4.14.x/0020-scsi-storvsc-Allow-only-one-remove-lun-work-item-to-.patch
@@ -1,4 +1,4 @@
-From 3b2d8cb6a4f53249a8388134c06f86687be9a122 Mon Sep 17 00:00:00 2001
+From 72aad803a3cf64392a984503ceb173c7519b7d14 Mon Sep 17 00:00:00 2001
 From: Cathy Avery <cavery@redhat.com>
 Date: Tue, 31 Oct 2017 08:52:06 -0400
 Subject: [PATCH 20/21] scsi: storvsc: Allow only one remove lun work item to
--- a/kernel/patches-4.14.x/0021-scsi-storvsc-Avoid-excessive-host-scan-on-controller.patch
+++ b/kernel/patches-4.14.x/0021-scsi-storvsc-Avoid-excessive-host-scan-on-controller.patch
@@ -1,4 +1,4 @@
-From 84260e214af54769eb9e4b0af5daf99950eaa5c9 Mon Sep 17 00:00:00 2001
+From 147f959fea03655b96a0f95eeea958c38760fe49 Mon Sep 17 00:00:00 2001
 From: Long Li <longli@microsoft.com>
 Date: Tue, 31 Oct 2017 14:58:08 -0700
 Subject: [PATCH 21/21] scsi: storvsc: Avoid excessive host scan on controller
--- 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 c9f594aa0c45e3b2e555f37d01c8505f2849e148 Mon Sep 17 00:00:00 2001
+From 4d85ad29b81cde20c5c31139ee9ce4141336f74c 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()
--- 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 f4fa633d5cc21ba9c29926a4aa144e94fb1b8cbe Mon Sep 17 00:00:00 2001
+From 9114b0b0adf04367b56b3f3a8811946c39ace96c 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
--- 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 65ef54ef3d1c8d29ab2fb899736e8001897e1545 Mon Sep 17 00:00:00 2001
+From 9cdd02e892680d18bd826693c930e7e70f1af695 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
--- 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 7b532c9bd03dfb12193f4e853a417b70cac6c625 Mon Sep 17 00:00:00 2001
+From 0e72a057c78c91ccd2e3a419fda97634d2af14c2 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
--- 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 167b858e2c006bee44f165c4d94994e3305026ba Mon Sep 17 00:00:00 2001
+From 959db81f9c942ee0f13cda3714490a2ef35d40c5 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
--- 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 d8d75a727ae6120603937f92b7c346e00ec9e370 Mon Sep 17 00:00:00 2001
+From aa13bdeceed3a83384ef6107ac6a41acd57f8019 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.
--- 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 9e8896dd4c781bd2e67a985ba509cde1b9124d05 Mon Sep 17 00:00:00 2001
+From 7b2f8601322859f5d5ce19362d812097803131ec 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
--- 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 72fcaa81f55c42897c8b5012ae7b581e9d79fa1f Mon Sep 17 00:00:00 2001
+From c133c5a3f1a71170786034d99f6c2bf42645c35b 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
--- 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 78605b21e74599fa3b44deb702222c449f383074 Mon Sep 17 00:00:00 2001
+From 8b45a15a2cb4d319142471affbe52b695b4a28a1 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.
--- 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 8f78fd2a693e2f29779a468b41ca274ceeda3aa6 Mon Sep 17 00:00:00 2001
+From 74eac7cdda571ca69299eba69d3f7f8a712f1355 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
--- 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 e108b69306a8843f423f9a4856c58cada401f2bd Mon Sep 17 00:00:00 2001
+From 24c7ec4eef2035e8ca59c9708c712c68c07c7958 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
--- 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 4d7964338af907e591accbeb29cfe745f6f00af0 Mon Sep 17 00:00:00 2001
+From fa3da21eead5c57498c61f4f578cca262cdba744 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
--- a/kernel/ucode/intel-ucode-md5sums
+++ b/kernel/ucode/intel-ucode-md5sums
@@ -1 +1 @@
-99c80f9229554953a868127cda44e7e3  microcode.tar.gz
+49f534f1079d3c5bc178a150c1c105aa  microcode.tar.gz
--- a/linuxkit.yml
+++ b/linuxkit.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
 init:
  - linuxkit/init:v0.6
--- a/projects/compose/compose-dynamic.yml
+++ b/projects/compose/compose-dynamic.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0 page_poison=1"
 init:
  - linuxkit/init:v0.6
--- a/projects/compose/compose-static.yml
+++ b/projects/compose/compose-static.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0 page_poison=1"
 init:
  - linuxkit/init:v0.6
--- a/projects/miragesdk/examples/mirage-dhcp.yml
+++ b/projects/miragesdk/examples/mirage-dhcp.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0 page_poison=1"
 init:
  - linuxkit/init:v0.6
--- 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.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0"
 init:
  - linuxkit/init:v0.6
--- a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml
+++ b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
  - linuxkit/init:v0.6
--- a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml
+++ b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
  - linuxkit/init:v0.6
--- 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.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0"
 init:
  - linuxkit/init:v0.6
--- 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.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0"
 init:
  - linuxkit/init:v0.6
--- 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.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0"
 init:
  - linuxkit/init:v0.6
--- 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.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0"
 init:
  - linuxkit/init:v0.6
--- 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.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0"
 init:
  - linuxkit/init:v0.6
--- 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.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0"
 init:
  - linuxkit/init:v0.6
--- a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml
+++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0"
 init:
  - linuxkit/init:v0.6
--- a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml
+++ b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml
@@ -1,5 +1,5 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0"
 init:
  - linuxkit/init:v0.6
--- 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.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0"
 init:
  - linuxkit/init:v0.6
--- 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,12 +1,12 @@
 kernel:
-  image: linuxkit/kernel:4.4.147
+  image: linuxkit/kernel:4.4.148
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
  - linuxkit/init:v0.6
  - linuxkit/runc:v0.6
 onboot:
  - name: check-kernel-config
-    image: linuxkit/test-kernel-config:2ef7eb902baab9d90eff9984b4580ab5aba95dac
+    image: linuxkit/test-kernel-config:1aaef970b5f70791d74d6f980ad38af4035948f8
  - name: poweroff
    image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300
    command: ["/bin/sh", "/poweroff.sh", "3"]
--- 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,12 +1,12 @@
 kernel:
-  image: linuxkit/kernel:4.9.119
+  image: linuxkit/kernel:4.9.120
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
  - linuxkit/init:v0.6
  - linuxkit/runc:v0.6
 onboot:
  - name: check-kernel-config
-    image: linuxkit/test-kernel-config:2ef7eb902baab9d90eff9984b4580ab5aba95dac
+    image: linuxkit/test-kernel-config:1aaef970b5f70791d74d6f980ad38af4035948f8
  - name: poweroff
    image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300
    command: ["/bin/sh", "/poweroff.sh", "3"]
--- a/test/cases/020_kernel/002_config_4.14.x/test.sh
+++ b/test/cases/020_kernel/002_config_4.14.x/test.sh
--- a/test/cases/020_kernel/002_config_4.14.x/test.yml
+++ b/test/cases/020_kernel/002_config_4.14.x/test.yml
@@ -1,12 +1,12 @@
 kernel:
-  image: linuxkit/kernel:4.14.62
+  image: linuxkit/kernel:4.14.63
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
  - linuxkit/init:v0.6
  - linuxkit/runc:v0.6
 onboot:
  - name: check-kernel-config
-    image: linuxkit/test-kernel-config:2ef7eb902baab9d90eff9984b4580ab5aba95dac
+    image: linuxkit/test-kernel-config:1aaef970b5f70791d74d6f980ad38af4035948f8
  - name: poweroff
    image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300
    command: ["/bin/sh", "/poweroff.sh", "3"]
--- a/test/cases/020_kernel/003_config_4.17.x/test.sh
+++ b/test/cases/020_kernel/003_config_4.17.x/test.sh
--- a/test/cases/020_kernel/003_config_4.17.x/test.yml
+++ b/test/cases/020_kernel/003_config_4.17.x/test.yml
@@ -1,12 +1,12 @@
 kernel:
-  image: linuxkit/kernel:4.17.14
+  image: linuxkit/kernel:4.17.15
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
  - linuxkit/init:v0.6
  - linuxkit/runc:v0.6
 onboot:
  - name: check-kernel-config
-    image: linuxkit/test-kernel-config:2ef7eb902baab9d90eff9984b4580ab5aba95dac
+    image: linuxkit/test-kernel-config:1aaef970b5f70791d74d6f980ad38af4035948f8
  - name: poweroff
    image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300
    command: ["/bin/sh", "/poweroff.sh", "3"]
--- a/test/cases/020_kernel/004_config_4.18.x/test.sh
+++ b/test/cases/020_kernel/004_config_4.18.x/test.sh
@@ -0,0 +1,24 @@
+#!/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
--- a/test/cases/020_kernel/004_config_4.18.x/test.yml
+++ b/test/cases/020_kernel/004_config_4.18.x/test.yml
@@ -0,0 +1,15 @@
+kernel:
+  image: linuxkit/kernel:4.18.1
+  cmdline: "console=ttyS0 console=ttyAMA0"
+init:
+  - linuxkit/init:v0.6
+  - linuxkit/runc:v0.6
+onboot:
+  - name: check-kernel-config
+    image: linuxkit/test-kernel-config:1aaef970b5f70791d74d6f980ad38af4035948f8
+  - name: poweroff
+    image: linuxkit/poweroff:afe8f7dd0d47a7991c54519b0f09124cb8c4e300
+    command: ["/bin/sh", "/poweroff.sh", "3"]
+trust:
+  org:
+    - linuxkit
--- 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.147 AS ksrc
+FROM linuxkit/kernel:4.4.148 AS ksrc

 # Extract headers and compile module
 FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build
--- 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.4.147
+docker pull linuxkit/kernel:4.4.148
 # Build a package
 docker build -t ${IMAGE_NAME} .

--- 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.147
+  image: linuxkit/kernel:4.4.148
  cmdline: "console=ttyS0 console=ttyAMA0"
 init:
  - linuxkit/init:v0.6
--- 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.119 AS ksrc
+FROM linuxkit/kernel:4.9.120 AS ksrc

 # Extract headers and compile module
 FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build
--- a/Show More
+++ b/Show More