From 9eed7af4b379fc3610917efe2c7e22feb1e79021 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 18 Feb 2021 09:05:09 +0100
Subject: [PATCH] main/linux-lts: upgrade to 5.4.99

---
 main/linux-lts/APKBUILD            | 28 ++++++++++++++--------------
 main/linux-lts/config-lts.aarch64  |  6 +++---
 main/linux-lts/config-lts.armv7    |  5 ++---
 main/linux-lts/config-lts.mips     |  7 +------
 main/linux-lts/config-lts.mips64   |  8 ++------
 main/linux-lts/config-lts.ppc64le  |  3 ++-
 main/linux-lts/config-lts.s390x    |  5 +++--
 main/linux-lts/config-lts.x86      |  7 +------
 main/linux-lts/config-lts.x86_64   |  5 ++---
 main/linux-lts/config-virt.aarch64 |  3 +--
 main/linux-lts/config-virt.armv7   |  3 +--
 main/linux-lts/config-virt.x86     |  7 ++-----
 main/linux-lts/config-virt.x86_64  |  3 +--
 13 files changed, 35 insertions(+), 55 deletions(-)

diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD
index 379ed6124737..b0cbeb265651 100644
--- a/main/linux-lts/APKBUILD
+++ b/main/linux-lts/APKBUILD
@@ -2,7 +2,7 @@
 
 _flavor=lts
 pkgname=linux-${_flavor}
-pkgver=5.4.84
+pkgver=5.4.99
 case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
@@ -223,16 +223,16 @@ _dev() {
 
 sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f  linux-5.4.tar.xz
 d19365fe94431008768c96a2c88955652f70b6df6677457ee55ee95246a64fdd2c6fed9b3bef37c29075178294a7fc91f148ead636382530ebfa822be4ad8c2f  0002-powerpc-config-defang-gcc-check-for-stack-protector-.patch
-1168476ddfdeaae598d74ffbd7907a4ce436c06c910f53970eb4d070713cc0b23e7395be609cb716ad6236a93d08be2c8c2ed96f409a086e4dc5bfe0cac2289e  config-lts.aarch64
-b45b040c3c6f8f9f33fb384ac49556d5b3e7594ceefc930a7246ed656692ac0e8aebec75e699a10559f2adfd0150bc5ffcb3ae9fc3dee0d57cf81cd9973162b9  config-lts.armv7
-0fc45a546bd28132cabcf379714c864f84d9e157d0a23057f30484a3904286c4ecf0b382b4b3efe370f18c04a5534d870f492aa1cb1ec5c0934e40980c9311e4  config-lts.x86
-68f3bbfbfe6527e06ecc98a6269f931adc1957cff51ffbb2da06561d94cd0a94e01a14633d298a135a6a423a19dc28d2070de4d26c6c31c02b7695011e25d279  config-lts.x86_64
-2ce4dc8c3569959c726526d8eeba16ecf9eb441d4dbba85f98424a172ebee80ad08beafd97516c4c599bc0c02094cb34ada64cb3f2bf82b69533db6585126e62  config-lts.ppc64le
-1f9a41b6799b57d2a161ce769e018368536f2bc6d79fc30c348c06e4f758f0b0913239171b6161ecb411070114c77a60e5e7a3e88b05a91330f09e45515caefb  config-lts.s390x
-4a42c873a6668ffaacd9f023135514412e4d717fed74a7bbc0a5237bf4f0740b91ad379b513913259d555d153896cffc7c50f1ca9db6b57b7d5c02afed74befa  config-lts.mips64
-54c9227979d2e6f83e12347bd94a8676c9734e8446cca117d8658afd134f4c7d7e8b18aa5d833f11ae904485da0ddc475695b425b6c3daa93d1452df7d3d65a2  config-lts.mips
-e0630a550bc76af0daf8f9f571015355a3b5f4c8b7d298b2a0fd76cf6d6a3617a4b06fc6c3aeaa9f42b6410e3acabcad078b9ebea49a30c73821f804f454b72b  config-virt.aarch64
-655f09ca788dba2f074aac5821448cc2cdf7f667ebf73b45ac7866e5a735c192d7944d991709eb914bc414742ea2edd16f1b511ad22a2daacbb87a54a4f3b8b0  config-virt.armv7
-4584c593db7855d16c365dabde5a0e3d8b51286643a8e0819bc436dd639354c9e42ad72f815111c3e3d14acd3cfb4a4a9b51255a6d5070fbe19e964592e6f83b  config-virt.x86
-609f961b10c27a8c60876447d7888aec340bf10935e7f1b462ffc07f54d76e2d446a279ea84a6e9662df9ee8491e6b93da46ce4919e1310e9ccc4a17346f8a76  config-virt.x86_64
-35d05cda2e19f4af36e74607ea7fea028b203bb99bc5b1df9e7339697448cf27e276a232ba0fb1b6313cd7a102333843cdf0dfbf0b27b2a86e0565f2a11234c0  patch-5.4.84.xz"
+953be3f750e5398fe1a73747ea8e19c8fdfaec4f64c421742d12a254c660b5c1daaa44a188f240f9eddf43be18ef63883088226666634f9c89fb49ed9c44e54b  config-lts.aarch64
+b42a0a3c05e6f01d9a025e728f74ad4f090b8006932b821721040ea0041332daaf2b6f045fd4fa6c3a7d32cfc79cd7a223fd63ff79da2d1506bdb252de300735  config-lts.armv7
+f736147ab44f65fe6a547518d2e518233f93337c13411737ee2f429304cfaa3c9ae00950656047dfc7ff9d1833e2aa69e39a2218bbc78d0d83c8a7692b4d2f3f  config-lts.x86
+6a276a03d3d373f68a2c7bc373c740503e28612c8ececf85bbeee933dd7f24e0e510b537e74982ea4a797c5eff3bbf14e3562c94f03891177767a7ee32c2f9c6  config-lts.x86_64
+4c6c39873fe0451e6cd4db7fb6daa0c404c9e231e5fd9e4475df341e2c52900364c07f77f93f82c07579e7234ea39abe6878f97695fc11b84199b18288f18409  config-lts.ppc64le
+f65e32101399d6c55161683fa59a0ac876fb400252bd3198ce6001292377d938f81ccdb8946f5cf022bbadc96b9287cce9590ae4a6cc88c26e143e4052e3961c  config-lts.s390x
+a46e69843a3a7a06b51de605d8c67944e82b90e38251b422d2b62f9902b78a6d7cce666bdf4495f6bb8a4989956c396d9bbfc6ea0259d895fada7a17366db76a  config-lts.mips64
+5f5a74198003b04695a1b5f7f5220656d95905274482178ff7cda8db3c6aa2f237166a10088035f05428e4a43c479a466d74585b66f226cf80d27785fa891831  config-lts.mips
+c281994be98e15b3476900b09ee706a8ce8833449abae42572193ba4e71b75ff7fc5aa21ebb6d986e3d79b93ddc1e085a32b754a9a39a5bf532fd4496154c09a  config-virt.aarch64
+62ae7b7b8e305c51e3a6f74c5260d869c3ab7a0678072241c03d6a64310614a3281e45901d34748c8d602d5c9492aaedc61e66056e5732edba8675600bfae44b  config-virt.armv7
+afb370762683df1169bd61cc2cd8b2e88e71929b815d41255d07e1f93920ce1b418d87f48e508114c06d307a401c400c01b47d6fab25948f61c720f4e2cc8886  config-virt.x86
+58c19f0b660806c7d1da21b402f670b6f08bbb703c87ce5baccbd0f17398019f37034ed32f570ad617348aa9f82262eefc21a9dfd6f0b14052faec4b531b1156  config-virt.x86_64
+00b9128b450c86742ecdfd9656d2527625cd257e95dd18bf032d0c9325e5eb67dc65e30b30b95e1dd00f590eb6ea85710d9c43b2d92fe03e93d761b34b7cc498  patch-5.4.99.xz"
diff --git a/main/linux-lts/config-lts.aarch64 b/main/linux-lts/config-lts.aarch64
index e8503d89effd..d503da05e33f 100644
--- a/main/linux-lts/config-lts.aarch64
+++ b/main/linux-lts/config-lts.aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.75 Kernel Configuration
+# Linux/arm64 5.4.99 Kernel Configuration
 #
 
 #
@@ -947,7 +947,6 @@ CONFIG_ZPOOL=m
 # CONFIG_ZBUD is not set
 CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=y
-# CONFIG_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
@@ -6509,7 +6508,6 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 # CONFIG_USB_APPLEDISPLAY is not set
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 # CONFIG_USB_TRANCEVIBRATOR is not set
 CONFIG_USB_IOWARRIOR=m
@@ -6754,6 +6752,7 @@ CONFIG_INFINIBAND_USER_MEM=y
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_VIRT_DMA=y
 CONFIG_INFINIBAND_MTHCA=m
 # CONFIG_INFINIBAND_MTHCA_DEBUG is not set
 CONFIG_INFINIBAND_CXGB3=m
@@ -9070,6 +9069,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_STACK_TRACER is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
 CONFIG_DYNAMIC_EVENTS=y
diff --git a/main/linux-lts/config-lts.armv7 b/main/linux-lts/config-lts.armv7
index ad48d730f6b7..361fd4b0f8c2 100644
--- a/main/linux-lts/config-lts.armv7
+++ b/main/linux-lts/config-lts.armv7
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.4.75 Kernel Configuration
+# Linux/arm 5.4.99 Kernel Configuration
 #
 
 #
@@ -971,7 +971,6 @@ CONFIG_ZPOOL=m
 CONFIG_ZBUD=m
 CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=m
-# CONFIG_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
@@ -5533,7 +5532,6 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 # CONFIG_USB_APPLEDISPLAY is not set
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 # CONFIG_USB_TRANCEVIBRATOR is not set
 CONFIG_USB_IOWARRIOR=m
@@ -7783,6 +7781,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_STACK_TRACER is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
 CONFIG_DYNAMIC_EVENTS=y
diff --git a/main/linux-lts/config-lts.mips b/main/linux-lts/config-lts.mips
index ddf73cdf1a9c..24bbb69ce16e 100644
--- a/main/linux-lts/config-lts.mips
+++ b/main/linux-lts/config-lts.mips
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/mips 5.4.75 Kernel Configuration
+# Linux/mips 5.4.99 Kernel Configuration
 #
 
 #
@@ -462,7 +462,6 @@ CONFIG_MIPS_EXTERNAL_TIMER=y
 #
 # CONFIG_FIRMWARE_MEMMAP is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
-CONFIG_EFI_EARLYCON=y
 
 #
 # Tegra firmware driver
@@ -518,7 +517,6 @@ CONFIG_64BIT_TIME=y
 CONFIG_COMPAT_32BIT_TIME=y
 # CONFIG_REFCOUNT_FULL is not set
 CONFIG_HAVE_ARCH_COMPILER_H=y
-CONFIG_ARCH_USE_MEMREMAP_PROT=y
 
 #
 # GCOV-based kernel profiling
@@ -2972,9 +2970,6 @@ CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FONT_8x16=y
-CONFIG_FONT_AUTOSELECT=y
 CONFIG_SG_POOL=y
 CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set
diff --git a/main/linux-lts/config-lts.mips64 b/main/linux-lts/config-lts.mips64
index 6ca778598fd0..6c182ca03e3d 100644
--- a/main/linux-lts/config-lts.mips64
+++ b/main/linux-lts/config-lts.mips64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/mips 5.4.75 Kernel Configuration
+# Linux/mips 5.4.99 Kernel Configuration
 #
 
 #
@@ -468,7 +468,6 @@ CONFIG_MIPS_EXTERNAL_TIMER=y
 #
 # CONFIG_FIRMWARE_MEMMAP is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
-CONFIG_EFI_EARLYCON=y
 
 #
 # Tegra firmware driver
@@ -486,6 +485,7 @@ CONFIG_CRASH_CORE=y
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 # CONFIG_JUMP_LABEL is not set
+CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
@@ -525,7 +525,6 @@ CONFIG_CLONE_BACKWARDS=y
 CONFIG_64BIT_TIME=y
 # CONFIG_REFCOUNT_FULL is not set
 CONFIG_HAVE_ARCH_COMPILER_H=y
-CONFIG_ARCH_USE_MEMREMAP_PROT=y
 
 #
 # GCOV-based kernel profiling
@@ -2996,9 +2995,6 @@ CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FONT_8x16=y
-CONFIG_FONT_AUTOSELECT=y
 CONFIG_SG_POOL=y
 CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set
diff --git a/main/linux-lts/config-lts.ppc64le b/main/linux-lts/config-lts.ppc64le
index b5bc04066217..4d6b00b353f0 100644
--- a/main/linux-lts/config-lts.ppc64le
+++ b/main/linux-lts/config-lts.ppc64le
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.4.75 Kernel Configuration
+# Linux/powerpc 5.4.99 Kernel Configuration
 #
 
 #
@@ -3438,6 +3438,7 @@ CONFIG_INFINIBAND_USER_MEM=y
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_VIRT_DMA=y
 CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
 CONFIG_INFINIBAND_CXGB3=m
diff --git a/main/linux-lts/config-lts.s390x b/main/linux-lts/config-lts.s390x
index 4deed0ea1222..9f111ef4d9d7 100644
--- a/main/linux-lts/config-lts.s390x
+++ b/main/linux-lts/config-lts.s390x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/s390 5.4.75 Kernel Configuration
+# Linux/s390 5.4.99 Kernel Configuration
 #
 
 #
@@ -676,7 +676,6 @@ CONFIG_ZPOOL=m
 CONFIG_ZBUD=y
 CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=y
-# CONFIG_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 # CONFIG_IDLE_PAGE_TRACKING is not set
@@ -2454,6 +2453,7 @@ CONFIG_INFINIBAND_USER_MEM=y
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_VIRT_DMA=y
 # CONFIG_INFINIBAND_MTHCA is not set
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_INFINIBAND_OCRDMA=m
@@ -3477,6 +3477,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_STACK_TRACER is not set
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
 CONFIG_DYNAMIC_EVENTS=y
diff --git a/main/linux-lts/config-lts.x86 b/main/linux-lts/config-lts.x86
index 7f07b35cfeee..73c9e96f083c 100644
--- a/main/linux-lts/config-lts.x86
+++ b/main/linux-lts/config-lts.x86
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.75 Kernel Configuration
+# Linux/x86 5.4.99 Kernel Configuration
 #
 
 #
@@ -906,7 +906,6 @@ CONFIG_ZPOOL=m
 # CONFIG_ZBUD is not set
 CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=y
-# CONFIG_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
@@ -6348,7 +6347,6 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 # CONFIG_USB_APPLEDISPLAY is not set
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 # CONFIG_USB_TRANCEVIBRATOR is not set
 CONFIG_USB_IOWARRIOR=m
@@ -6538,8 +6536,6 @@ CONFIG_MLX5_INFINIBAND=m
 # CONFIG_INFINIBAND_OCRDMA is not set
 # CONFIG_INFINIBAND_VMWARE_PVRDMA is not set
 # CONFIG_INFINIBAND_USNIC is not set
-CONFIG_RDMA_RXE=m
-# CONFIG_RDMA_SIW is not set
 CONFIG_INFINIBAND_IPOIB=m
 # CONFIG_INFINIBAND_IPOIB_CM is not set
 # CONFIG_INFINIBAND_IPOIB_DEBUG is not set
@@ -8303,7 +8299,6 @@ CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_DMA_VIRT_OPS=y
 CONFIG_SWIOTLB=y
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_SGL_ALLOC=y
diff --git a/main/linux-lts/config-lts.x86_64 b/main/linux-lts/config-lts.x86_64
index 536218629a35..7de2b15b58cd 100644
--- a/main/linux-lts/config-lts.x86_64
+++ b/main/linux-lts/config-lts.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.4.75 Kernel Configuration
+# Linux/x86_64 5.4.99 Kernel Configuration
 #
 
 #
@@ -954,7 +954,6 @@ CONFIG_ZPOOL=m
 # CONFIG_ZBUD is not set
 CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=y
-# CONFIG_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
@@ -6384,7 +6383,6 @@ CONFIG_USB_IDMOUSE=m
 CONFIG_USB_FTDI_ELAN=m
 # CONFIG_USB_APPLEDISPLAY is not set
 CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 # CONFIG_USB_TRANCEVIBRATOR is not set
 CONFIG_USB_IOWARRIOR=m
@@ -6563,6 +6561,7 @@ CONFIG_INFINIBAND_USER_MEM=y
 CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_VIRT_DMA=y
 CONFIG_INFINIBAND_MTHCA=m
 # CONFIG_INFINIBAND_MTHCA_DEBUG is not set
 # CONFIG_INFINIBAND_QIB is not set
diff --git a/main/linux-lts/config-virt.aarch64 b/main/linux-lts/config-virt.aarch64
index 78d81173ae93..5f340477eba0 100644
--- a/main/linux-lts/config-virt.aarch64
+++ b/main/linux-lts/config-virt.aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.75 Kernel Configuration
+# Linux/arm64 5.4.99 Kernel Configuration
 #
 
 #
@@ -905,7 +905,6 @@ CONFIG_ZPOOL=m
 # CONFIG_ZBUD is not set
 CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=y
-# CONFIG_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
diff --git a/main/linux-lts/config-virt.armv7 b/main/linux-lts/config-virt.armv7
index f806978f7e71..34c3b17432e1 100644
--- a/main/linux-lts/config-virt.armv7
+++ b/main/linux-lts/config-virt.armv7
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.4.75 Kernel Configuration
+# Linux/arm 5.4.99 Kernel Configuration
 #
 
 #
@@ -836,7 +836,6 @@ CONFIG_ZPOOL=m
 # CONFIG_ZBUD is not set
 CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=y
-# CONFIG_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
diff --git a/main/linux-lts/config-virt.x86 b/main/linux-lts/config-virt.x86
index d2d75ddb3a28..9e53be9e2a11 100644
--- a/main/linux-lts/config-virt.x86
+++ b/main/linux-lts/config-virt.x86
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.75 Kernel Configuration
+# Linux/x86 5.4.99 Kernel Configuration
 #
 
 #
@@ -594,7 +594,6 @@ CONFIG_FW_CFG_SYSFS=m
 # CONFIG_GOOGLE_FIRMWARE is not set
 CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_X86=y
-CONFIG_EFI_EARLYCON=y
 
 #
 # Tegra firmware driver
@@ -709,7 +708,6 @@ CONFIG_STRICT_MODULE_RWX=y
 CONFIG_ARCH_HAS_REFCOUNT=y
 # CONFIG_REFCOUNT_FULL is not set
 CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
-CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
 
@@ -859,7 +857,6 @@ CONFIG_ZPOOL=m
 # CONFIG_ZBUD is not set
 CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=y
-# CONFIG_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
@@ -4319,7 +4316,7 @@ CONFIG_UCS2_STRING=m
 CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
 CONFIG_GENERIC_VDSO_32=y
-CONFIG_FONT_SUPPORT=y
+CONFIG_FONT_SUPPORT=m
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
diff --git a/main/linux-lts/config-virt.x86_64 b/main/linux-lts/config-virt.x86_64
index a2509715aade..300d6eee2a1f 100644
--- a/main/linux-lts/config-virt.x86_64
+++ b/main/linux-lts/config-virt.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.4.75 Kernel Configuration
+# Linux/x86_64 5.4.99 Kernel Configuration
 #
 
 #
@@ -910,7 +910,6 @@ CONFIG_ZPOOL=m
 # CONFIG_ZBUD is not set
 CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=y
-# CONFIG_PGTABLE_MAPPING is not set
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
-- 
GitLab