diff --git a/testing/linux-edge/APKBUILD b/testing/linux-edge/APKBUILD
index e724bd978e3..9f728f988ca 100644
--- a/testing/linux-edge/APKBUILD
+++ b/testing/linux-edge/APKBUILD
@@ -4,7 +4,7 @@ _flavor=edge
 pkgname=linux-${_flavor}
 # NOTE: this kernel is intended for testing
 # please resist urge to upgrade it blindly
-pkgver=5.12.3
+pkgver=5.12.4
 case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
@@ -218,11 +218,13 @@ _dev() {
 		"$subpkgdir"/lib/modules/${_abi_release}/build
 }
 
-sha512sums="be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d  linux-5.12.tar.xz
-37896e0f6c1f18930cb95ec0d39d514465fe46e872033613f3592f5f3d06da0aa02d796e7d43d403c16aa310d60df4a2e78b7141d9a3ed8df0448955eb1d310f  patch-5.12.3.xz
-719f7f953287fe3a3eaa41b998ac768b6fea3dbae251a69540e1720af582a9d62dedfded1280f7389fbadde4def656dde4047f2c2adb71d09d97e6d8ae82384a  config-edge.aarch64
-1a6e26d0505d1428f271fc6e0c0256d17dbab95287818a3a3019f14d920d013114c893cfd0f49d54b1137350da4aff70a57f3ad6136a6ac1cbe77c3924e0e9a2  config-edge.armv7
-d15426b0375483c1bd59ceca9b5393776a0d9c0ad791f2f9b1e35c2c0f316fc099b944774bdd55eb860799c072e6e3b2ebae783503b885e0d9231be4224f17d5  config-edge.x86_64
-81ce8f2a99e975b1456f3bab63a5b0a4f06db8d093b637745c07b644070d248b6c8ae87d81af16af818b915081b0eaec87df83fe34f8034fa1515a90170232ba  config-edge-virt.aarch64
-8c1b4cbbc38509bd503cf03ab563182620580f845bbc3465af7a57944a9f65a53a8adae62375ecccefc67f77de8afb145407379927321b4b73270d2a25fae6b1  config-edge-virt.armv7
-9777c9eb1b5e10334407a147220eef66f398d3feaf9d5ed8a074fddb77730f79490e74cea29234679648ac3e888be6645525da7f78fbe20f05156b95821f899c  config-edge-virt.x86_64"
+sha512sums="
+be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d  linux-5.12.tar.xz
+e09a38795c4756298d0616277a62f32c59746b8b3c1977687707cbbf619121d566b8eef3e6d4327aa9b682adba888f4d08a609290a9cbac5bb57107bb2fb96a2  patch-5.12.4.xz
+aeaab9001a588d4a2057fd6f1bd36245d7ff438a58a6d1ac3285014f6151102512142027806b17735bbdc47feaa7e8bf5cea4112d7da2ffda25f92650ea74c84  config-edge.aarch64
+c0df6e65cee3658e33ed5d4eecd486f316e3eb5ee6ba567fead70026613fb9e80721c889feaae0e5ff65429b54a5b4dc830b53924e09c41bc184e1c21d8727e3  config-edge.armv7
+6a0a8a6f598585898bc6388fc4e03f04a130b760810278e941ce0c48da5a854da12b2bbda4727b7c80440baea4da0202612915e763b7bb8a6c520832c9070835  config-edge.x86_64
+daed24877a1b6f76d9a0b9fbde97ee2fa539474b5823a2123fd3a6ae845e504414506436e3fa1f517b1b207136f9d615eb81196988162ae0a3d3837a4e3059f1  config-edge-virt.aarch64
+d70f12b5c0f3792698a819115010f4bd911b667cb20dacfa84aa84e7b282aa1eff691ce8a28446546c8bd4928234dbc63ae52737856222c1000af2d3ed4f9c60  config-edge-virt.armv7
+73891656dea6205c9c2f7fbb47dab1877457e2e301ced6bc0a5c95d60d86b6fbc21eef129cdd451edca008b3011e01642bd6e486902726a4f7da4daa9739dc8f  config-edge-virt.x86_64
+"
diff --git a/testing/linux-edge/config-edge-virt.aarch64 b/testing/linux-edge/config-edge-virt.aarch64
index 049a3834cc0..daefb5a2c29 100644
--- a/testing/linux-edge/config-edge-virt.aarch64
+++ b/testing/linux-edge/config-edge-virt.aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.12.3 Kernel Configuration
+# Linux/arm64 5.12.4 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.3.1_git20210409) 10.3.1 20210409"
 CONFIG_CC_IS_GCC=y
diff --git a/testing/linux-edge/config-edge-virt.armv7 b/testing/linux-edge/config-edge-virt.armv7
index b522220a9c3..6bf40f6dbd5 100644
--- a/testing/linux-edge/config-edge-virt.armv7
+++ b/testing/linux-edge/config-edge-virt.armv7
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.12.3 Kernel Configuration
+# Linux/arm 5.12.4 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.3.1_git20210409) 10.3.1 20210409"
 CONFIG_CC_IS_GCC=y
diff --git a/testing/linux-edge/config-edge-virt.x86_64 b/testing/linux-edge/config-edge-virt.x86_64
index bf5a3a5dc2e..a874f611bee 100644
--- a/testing/linux-edge/config-edge-virt.x86_64
+++ b/testing/linux-edge/config-edge-virt.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.12.3 Kernel Configuration
+# Linux/x86_64 5.12.4 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.3.1_git20210409) 10.3.1 20210409"
 CONFIG_CC_IS_GCC=y
diff --git a/testing/linux-edge/config-edge.aarch64 b/testing/linux-edge/config-edge.aarch64
index 0366d430155..899e1ec5541 100644
--- a/testing/linux-edge/config-edge.aarch64
+++ b/testing/linux-edge/config-edge.aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.12.3 Kernel Configuration
+# Linux/arm64 5.12.4 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.3.1_git20210409) 10.3.1 20210409"
 CONFIG_CC_IS_GCC=y
@@ -8023,7 +8023,6 @@ CONFIG_HID_SENSOR_ACCEL_3D=m
 # CONFIG_AD7923 is not set
 # CONFIG_AD7949 is not set
 # CONFIG_AD799X is not set
-# CONFIG_AD9467 is not set
 # CONFIG_ADI_AXI_ADC is not set
 # CONFIG_AXP20X_ADC is not set
 # CONFIG_AXP288_ADC is not set
diff --git a/testing/linux-edge/config-edge.armv7 b/testing/linux-edge/config-edge.armv7
index 9f29ff5ab3b..1f6338deac3 100644
--- a/testing/linux-edge/config-edge.armv7
+++ b/testing/linux-edge/config-edge.armv7
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.12.3 Kernel Configuration
+# Linux/arm 5.12.4 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.3.1_git20210409) 10.3.1 20210409"
 CONFIG_CC_IS_GCC=y
@@ -6695,7 +6695,6 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_AD7923 is not set
 # CONFIG_AD7949 is not set
 # CONFIG_AD799X is not set
-# CONFIG_AD9467 is not set
 # CONFIG_ADI_AXI_ADC is not set
 # CONFIG_AXP20X_ADC is not set
 CONFIG_AXP288_ADC=m
diff --git a/testing/linux-edge/config-edge.x86_64 b/testing/linux-edge/config-edge.x86_64
index 797bac174e7..bf49f7a7724 100644
--- a/testing/linux-edge/config-edge.x86_64
+++ b/testing/linux-edge/config-edge.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.12.3 Kernel Configuration
+# Linux/x86_64 5.12.4 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.3.1_git20210409) 10.3.1 20210409"
 CONFIG_CC_IS_GCC=y
@@ -310,7 +310,6 @@ CONFIG_RETPOLINE=y
 CONFIG_X86_EXTENDED_PLATFORM=y
 # CONFIG_X86_NUMACHIP is not set
 # CONFIG_X86_VSMP is not set
-# CONFIG_X86_UV is not set
 # CONFIG_X86_GOLDFISH is not set
 # CONFIG_X86_INTEL_MID is not set
 CONFIG_X86_INTEL_LPSS=y
@@ -7384,7 +7383,6 @@ CONFIG_HID_SENSOR_ACCEL_3D=m
 # CONFIG_AD7923 is not set
 # CONFIG_AD7949 is not set
 # CONFIG_AD799X is not set
-# CONFIG_AD9467 is not set
 # CONFIG_CC10001_ADC is not set
 # CONFIG_HI8435 is not set
 # CONFIG_HX711 is not set