diff --git a/main/linux-postmarketos-qcom-msm8996/APKBUILD b/main/linux-postmarketos-qcom-msm8996/APKBUILD
index c8bdd5944..93114f5e1 100644
--- a/main/linux-postmarketos-qcom-msm8996/APKBUILD
+++ b/main/linux-postmarketos-qcom-msm8996/APKBUILD
@@ -3,7 +3,7 @@
 
 _flavor="postmarketos-qcom-msm8996"
 pkgname=linux-$_flavor
-pkgver=5.12.7
+pkgver=5.12.12
 pkgrel=0
 pkgdesc="Kernel close to mainline with extra patches for Qualcomm MSM8996 devices"
 arch="aarch64"
@@ -47,6 +47,6 @@ package() {
 		INSTALL_DTBS_PATH="$pkgdir"/usr/share/dtb
 }
 sha512sums="
-b8cdf7c97f8275ac0af7b73f87ff03f4738803dc60dcd28a9b9238858ef5cba454a6ed9637dde102f57aa5cdc7a99593331b8ea08dbb7e413bff9427911ab5c7  linux-msm8996-v5.12.7-msm8996.tar.gz
-c1e2537644188e22d3e3c2727ac6940d06013b73754c532e9f202fb8b583f54ec46b128c12b84cd802d1bf1b1a1ea482aaf5a319a2d37521b47483444e856328  config-postmarketos-qcom-msm8996.aarch64
+d98b255750d97da89829081a80af66d2c0b5b4c525c637ab399ec15ab3b8fec38c0299c853a09117ad9acf3d6cf5127d39a25505eb987631218a6f8a740e34e0  linux-msm8996-v5.12.12-msm8996.tar.gz
+e010e53eb997ec836deab3e56235d1badf03bf2061574b9e0ade3e5d42c6924f0e780efa764ae8cbb700416eb2326d4dfdfca4498b8fb2d2b232d340900865ef  config-postmarketos-qcom-msm8996.aarch64
 "
diff --git a/main/linux-postmarketos-qcom-msm8996/config-postmarketos-qcom-msm8996.aarch64 b/main/linux-postmarketos-qcom-msm8996/config-postmarketos-qcom-msm8996.aarch64
index f4294bf95..193fe92ec 100644
--- a/main/linux-postmarketos-qcom-msm8996/config-postmarketos-qcom-msm8996.aarch64
+++ b/main/linux-postmarketos-qcom-msm8996/config-postmarketos-qcom-msm8996.aarch64
@@ -1,15 +1,18 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.12.7 Kernel Configuration
+# Linux/arm64 5.12.12 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 10.3.1_git20210424) 10.3.1 20210424"
+CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 11.1.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100301
+CONFIG_GCC_VERSION=110100
 CONFIG_CLANG_VERSION=0
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23502
+CONFIG_LD_VERSION=23601
 CONFIG_LLD_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
@@ -521,15 +524,18 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CPU Idle
 #
 CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE_GOV_MENU=y
 # CONFIG_CPU_IDLE_GOV_TEO is not set
+CONFIG_DT_IDLE_STATES=y
 
 #
 # ARM CPU Idle Drivers
 #
-# CONFIG_ARM_CPUIDLE is not set
-# CONFIG_ARM_PSCI_CPUIDLE is not set
+CONFIG_ARM_CPUIDLE=y
+CONFIG_ARM_PSCI_CPUIDLE=y
+CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
 # end of ARM CPU Idle Drivers
 # end of CPU Idle
 
@@ -1470,6 +1476,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 #
 # CONFIG_BLK_DEV_NVME is not set
 # CONFIG_NVME_FC is not set
+# CONFIG_NVME_TCP is not set
 # CONFIG_NVME_TARGET is not set
 # end of NVME Support
 
@@ -6259,6 +6266,7 @@ CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 # CONFIG_UBSAN is not set
+CONFIG_HAVE_KCSAN_COMPILER=y
 # end of Generic Kernel Debugging Instruments
 
 CONFIG_DEBUG_KERNEL=y
@@ -6294,6 +6302,7 @@ CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
 CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
+CONFIG_CC_HAS_KASAN_SW_TAGS=y
 CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 # CONFIG_KASAN is not set
 CONFIG_HAVE_ARCH_KFENCE=y