Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kernel updates #3919

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion examples/cadvisor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/dm-crypt-loop.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=tty0 console=ttyS0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/dm-crypt.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=tty0 console=ttyS0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/docker-for-mac.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This is an example for building the open source components of Docker for Mac
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=ttyS0 page_poison=1"
init:
- linuxkit/vpnkit-expose-port:c61565ee34e58823aaf7c05fd6359a8fd889137f # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
Expand Down
2 changes: 1 addition & 1 deletion examples/docker.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/getty.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/hostmount-writeable-overlay.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/influxdb-os.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/logging.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Simple example of using an external logging service
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/minimal.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/node_exporter.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=tty0 console=ttyS0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/openstack.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=ttyS0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/platform-aws.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=ttyS0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/platform-azure.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=ttyS0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/platform-gcp.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=ttyS0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/platform-hetzner.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: console=ttyS1
ucode: intel-ucode.cpio
init:
Expand Down
2 changes: 1 addition & 1 deletion examples/platform-packet.arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# for arm64 then the 'ucode' line in the kernel section can be left
# out.
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=ttyAMA0"
ucode: ""
onboot:
Expand Down
2 changes: 1 addition & 1 deletion examples/platform-packet.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: console=ttyS1
ucode: intel-ucode.cpio
init:
Expand Down
2 changes: 1 addition & 1 deletion examples/platform-scaleway.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/platform-vmware.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=tty0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/platform-vultr.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=ttyS0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/redis-os.yml
Original file line number Diff line number Diff line change
@@ -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.104
image: linuxkit/kernel:5.10.179
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/sshd.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/static-ip.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/swap.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/tpm.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=tty0 console=ttyS0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/vpnkit-forwarder.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=ttyS0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/vsudd-containerd.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=ttyS0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
2 changes: 1 addition & 1 deletion examples/wireguard.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kernel:
image: linuxkit/kernel:5.10.104
image: linuxkit/kernel:5.10.179
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init:
- linuxkit/init:144c9cee8aed9e30a16940f2bf1d3813883aceda
Expand Down
14 changes: 6 additions & 8 deletions kernel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -269,16 +269,14 @@ endef
# Debug targets only for latest stable and LTS stable
#
ifeq ($(ARCH),x86_64)
$(eval $(call kernel,5.15.27,5.15.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,5.15.27,5.15.x,,-dbg))
$(eval $(call kernel,5.10.104,5.10.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,5.4.172,5.4.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,5.11.4,5.11.x,-rt,))
$(eval $(call kernel,5.15.110,5.15.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,5.15.110,5.15.x,,-dbg))
$(eval $(call kernel,5.10.179,5.10.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,5.4.242,5.4.x,$(EXTRA),$(DEBUG)))

else ifeq ($(ARCH),$(filter $(ARCH),aarch64 arm64))
$(eval $(call kernel,5.15.27,5.15.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,5.10.104,5.10.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,5.11.4,5.11.x,-rt,))
$(eval $(call kernel,5.15.110,5.15.x,$(EXTRA),$(DEBUG)))
$(eval $(call kernel,5.10.179,5.10.x,$(EXTRA),$(DEBUG)))

endif

Expand Down
57 changes: 29 additions & 28 deletions kernel/config-5.10.x-aarch64
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.10.104 Kernel Configuration
# Linux/arm64 5.10.179 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=100201
CONFIG_LD_VERSION=235020000
CONFIG_CLANG_VERSION=0
CONFIG_AS_IS_GNU=y
CONFIG_AS_VERSION=23502
CONFIG_LLD_VERSION=0
CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
Expand Down Expand Up @@ -342,6 +344,7 @@ CONFIG_ARM64_ERRATUM_1286807=y
CONFIG_ARM64_ERRATUM_1463225=y
CONFIG_ARM64_ERRATUM_1542419=y
CONFIG_ARM64_ERRATUM_1508412=y
CONFIG_ARM64_ERRATUM_2457168=y
CONFIG_CAVIUM_ERRATUM_22375=y
CONFIG_CAVIUM_ERRATUM_23154=y
CONFIG_CAVIUM_ERRATUM_27456=y
Expand Down Expand Up @@ -397,6 +400,7 @@ CONFIG_XEN_DOM0=y
CONFIG_XEN=y
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_UNMAP_KERNEL_AT_EL0=y
CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
# CONFIG_ARM64_SW_TTBR0_PAN is not set
CONFIG_ARM64_TAGGED_ADDR_ABI=y
Expand Down Expand Up @@ -444,7 +448,6 @@ CONFIG_ARM64_TLB_RANGE=y
# ARMv8.5 architectural features
#
CONFIG_ARM64_BTI=y
CONFIG_ARM64_BTI_KERNEL=y
CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
CONFIG_ARM64_E0PD=y
CONFIG_ARCH_RANDOM=y
Expand Down Expand Up @@ -955,6 +958,7 @@ CONFIG_INET_ESP=m
# CONFIG_INET_ESP_OFFLOAD is not set
# CONFIG_INET_ESPINTCP is not set
CONFIG_INET_IPCOMP=m
CONFIG_INET_TABLE_PERTURB_ORDER=16
CONFIG_INET_XFRM_TUNNEL=m
CONFIG_INET_TUNNEL=y
CONFIG_INET_DIAG=y
Expand Down Expand Up @@ -1418,7 +1422,6 @@ CONFIG_NET_SCH_INGRESS=m
#
CONFIG_NET_CLS=y
CONFIG_NET_CLS_BASIC=y
CONFIG_NET_CLS_TCINDEX=y
CONFIG_NET_CLS_ROUTE4=y
CONFIG_NET_CLS_FW=y
CONFIG_NET_CLS_U32=y
Expand Down Expand Up @@ -2389,7 +2392,6 @@ CONFIG_XEN_NETDEV_FRONTEND=y
# CONFIG_NETDEVSIM is not set
CONFIG_NET_FAILOVER=y
# CONFIG_ISDN is not set
# CONFIG_NVM is not set

#
# Input device support
Expand Down Expand Up @@ -2524,7 +2526,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
CONFIG_SERIAL_8250_EXTENDED=y
# CONFIG_SERIAL_8250_MANY_PORTS is not set
# CONFIG_SERIAL_8250_ASPEED_VUART is not set
CONFIG_SERIAL_8250_SHARE_IRQ=y
# CONFIG_SERIAL_8250_DETECT_IRQ is not set
# CONFIG_SERIAL_8250_RSA is not set
Expand Down Expand Up @@ -2613,10 +2614,9 @@ CONFIG_TCG_VTPM_PROXY=m
CONFIG_TCG_TIS_ST33ZP24=m
CONFIG_TCG_TIS_ST33ZP24_I2C=m
# CONFIG_XILLYBUS is not set
# end of Character devices

# CONFIG_RANDOM_TRUST_CPU is not set
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
# end of Character devices

#
# I2C support
Expand Down Expand Up @@ -4482,7 +4482,6 @@ CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_AUDIT=y
CONFIG_IMA=y
CONFIG_IMA_MEASURE_PCR_IDX=10
# CONFIG_IMA_TEMPLATE is not set
CONFIG_IMA_NG_TEMPLATE=y
# CONFIG_IMA_SIG_TEMPLATE is not set
CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng"
Expand Down Expand Up @@ -4689,26 +4688,6 @@ CONFIG_CRYPTO_USER_API_AEAD=y
CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_HASH_INFO=y

#
# Crypto library routines
#
CONFIG_CRYPTO_LIB_AES=y
CONFIG_CRYPTO_LIB_ARC4=y
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
CONFIG_CRYPTO_LIB_BLAKE2S=m
CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y
CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y
CONFIG_CRYPTO_LIB_CHACHA=m
CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_DES=y
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y
CONFIG_CRYPTO_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
CONFIG_CRYPTO_LIB_SHA256=y
CONFIG_CRYPTO_HW=y
# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
# CONFIG_CRYPTO_DEV_EXYNOS_RNG is not set
Expand Down Expand Up @@ -4771,6 +4750,28 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
# CONFIG_INDIRECT_PIO is not set

#
# Crypto library routines
#
CONFIG_CRYPTO_LIB_AES=y
CONFIG_CRYPTO_LIB_ARC4=y
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y
CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y
CONFIG_CRYPTO_LIB_CHACHA=m
CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
CONFIG_CRYPTO_LIB_CURVE25519=m
CONFIG_CRYPTO_LIB_DES=y
CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y
CONFIG_CRYPTO_LIB_POLY1305=m
CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
CONFIG_CRYPTO_LIB_SHA256=y
# end of Crypto library routines

CONFIG_LIB_MEMNEQ=y
CONFIG_CRC_CCITT=y
CONFIG_CRC16=y
CONFIG_CRC_T10DIF=y
Expand Down