From ea6a2fc8149dcf5250185da8eaaa06f4f4fd2ad2 Mon Sep 17 00:00:00 2001
From: Clayton Craft <craftyguy@postmarketos.org>
Date: Thu, 23 Apr 2026 19:26:38 -0700
Subject: [PATCH] linux-postmarketos-asahi: upgrade to 6.19.12-1

Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8423>
---
 .../testing/linux-postmarketos-asahi/APKBUILD |  6 +-
 .../config-postmarketos-asahi.aarch64         | 68 +++++++++-----
 .../linux-postmarketos-asahi/pmos.config      | 91 ++++++++++++-------
 3 files changed, 108 insertions(+), 57 deletions(-)

diff --git a/device/testing/linux-postmarketos-asahi/APKBUILD b/device/testing/linux-postmarketos-asahi/APKBUILD
index 79fb87d9b..8a2ddbdb2 100644
--- a/device/testing/linux-postmarketos-asahi/APKBUILD
+++ b/device/testing/linux-postmarketos-asahi/APKBUILD
@@ -1,6 +1,6 @@
 maintainer="Clayton Craft <clayton@craftyguy.net>"
 pkgname=linux-postmarketos-asahi
-pkgver=6.19.11_p3
+pkgver=6.19.12_p1
 pkgrel=0
 _rel=${pkgver#*_p}
 _kver=${pkgver%_p*}
@@ -88,7 +88,7 @@ package() {
 }
 
 sha512sums="
-2319f2b5384129c067b6ce8d342819624395471090fdb2fb5701856bfa43850620f6cdfccc5c44e2e62cfd633117615066020f1cb3bf6242cd37dd22a325373a  linux-postmarketos-asahi-6.19.11-3.tar.gz
-f327dcc97b12c78068c7a295739842ac6f921d82adeddf021adef1da585f69429072b092352e4638e4a403ec471cd3aef7a41b8fa1bc8b066cbf23d47b6285f3  config-postmarketos-asahi.aarch64
+9b7965690f107c5f039c83dc190b674db4427490e82fe225dfdb5b637eb9462de173fa746e2af085ddac8eedf5b22129f0041c7a3fe7ecbaa3ef9b809e22782c  linux-postmarketos-asahi-6.19.12-1.tar.gz
+bfa1a11fed7f6b08873e85a550f74ec76943e22b777f8c4210ca07d7a8c9861cda78c832373ccff0a581c729c68a25ac220b42c6eff0bf951122800e1b034dbc  config-postmarketos-asahi.aarch64
 8d205300cfabe192b53ed1cc644b087e76421eb973e1b2a31d657e4f2676badebdfcf6b0865569c43b4b904935435f6e729c3a8d4a6221fb5792e40ec1017a0f  0001-nvmem-apple-spmi-nvmem-Fix-CFI-failures.patch
 "
diff --git a/device/testing/linux-postmarketos-asahi/config-postmarketos-asahi.aarch64 b/device/testing/linux-postmarketos-asahi/config-postmarketos-asahi.aarch64
index f4d0123bc..17c61a46a 100644
--- a/device/testing/linux-postmarketos-asahi/config-postmarketos-asahi.aarch64
+++ b/device/testing/linux-postmarketos-asahi/config-postmarketos-asahi.aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.19.11 Kernel Configuration
+# Linux/arm64 6.19.12 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="Alpine clang version 22.1.3"
 CONFIG_GCC_VERSION=0
@@ -11,9 +11,9 @@ CONFIG_AS_VERSION=220103
 CONFIG_LD_VERSION=0
 CONFIG_LD_IS_LLD=y
 CONFIG_LLD_VERSION=220103
-CONFIG_RUSTC_VERSION=109401
+CONFIG_RUSTC_VERSION=109500
 CONFIG_RUST_IS_AVAILABLE=y
-CONFIG_RUSTC_LLVM_VERSION=220101
+CONFIG_RUSTC_LLVM_VERSION=220103
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
@@ -290,7 +290,7 @@ CONFIG_PERF_EVENTS=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_RUST=y
-CONFIG_RUSTC_VERSION_TEXT="rustc 1.94.1 (e408947bf 2026-03-25) (Alpine Linux Rust 1.94.1-r0)"
+CONFIG_RUSTC_VERSION_TEXT="rustc 1.95.0 (59807616e 2026-04-14) (Alpine Linux Rust 1.95.0-r0)"
 CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.72.1"
 CONFIG_TRACEPOINTS=y
 
@@ -8523,7 +8523,7 @@ CONFIG_F2FS_IOSTAT=y
 # CONFIG_F2FS_UNFAIR_RWSEM is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
-# CONFIG_EXPORTFS_BLOCK_OPS is not set
+CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
 # CONFIG_FS_ENCRYPTION is not set
 # CONFIG_FS_VERITY is not set
@@ -8558,7 +8558,12 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 CONFIG_NETFS_SUPPORT=y
 # CONFIG_NETFS_STATS is not set
 # CONFIG_NETFS_DEBUG is not set
-# CONFIG_FSCACHE is not set
+CONFIG_FSCACHE=y
+# CONFIG_FSCACHE_STATS is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_ERROR_INJECTION is not set
+# CONFIG_CACHEFILES_ONDEMAND is not set
 # end of Caches
 
 #
@@ -8681,36 +8686,51 @@ CONFIG_EROFS_FS_ZIP_ZSTD=y
 # CONFIG_EROFS_FS_ONDEMAND is not set
 # CONFIG_EROFS_FS_PCPU_KTHREAD is not set
 CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=y
+CONFIG_NFS_FS=m
 # CONFIG_NFS_V2 is not set
-CONFIG_NFS_V3=y
+CONFIG_NFS_V3=m
 # CONFIG_NFS_V3_ACL is not set
-CONFIG_NFS_V4=y
+CONFIG_NFS_V4=m
 # CONFIG_NFS_SWAP is not set
 CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_2=y
-CONFIG_PNFS_FILE_LAYOUT=y
-CONFIG_PNFS_BLOCK=y
-CONFIG_PNFS_FLEXFILE_LAYOUT=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 # CONFIG_NFS_V4_1_MIGRATION is not set
 CONFIG_NFS_V4_SECURITY_LABEL=y
-CONFIG_ROOT_NFS=y
-# CONFIG_NFS_FSCACHE is not set
+CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFS_V4_2_READ_PLUS=y
-# CONFIG_NFSD is not set
-CONFIG_GRACE_PERIOD=y
-CONFIG_LOCKD=y
+CONFIG_NFSD=m
+# CONFIG_NFSD_V2 is not set
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_PNFS=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+# CONFIG_NFSD_FLEXFILELAYOUT is not set
+CONFIG_NFSD_V4_2_INTER_SSC=y
+# CONFIG_NFSD_V4_SECURITY_LABEL is not set
+# CONFIG_NFSD_LEGACY_CLIENT_TRACKING is not set
+# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
+# CONFIG_NFS_LOCALIO is not set
 CONFIG_NFS_V4_2_SSC_HELPER=y
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
-CONFIG_RPCSEC_GSS_KRB5=y
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
 # CONFIG_SUNRPC_DEBUG is not set
 # CONFIG_CEPH_FS is not set
 CONFIG_CIFS=m
@@ -8723,12 +8743,14 @@ CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_SWN_UPCALL is not set
+# CONFIG_CIFS_FSCACHE is not set
 # CONFIG_CIFS_COMPRESSION is not set
 # CONFIG_SMB_SERVER is not set
 CONFIG_SMBFS=m
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
 CONFIG_9P_FS=y
+# CONFIG_9P_FSCACHE is not set
 # CONFIG_9P_FS_POSIX_ACL is not set
 # CONFIG_9P_FS_SECURITY is not set
 CONFIG_NLS=y
@@ -8924,11 +8946,11 @@ CONFIG_CRYPTO_ECDH=m
 # Block ciphers
 #
 CONFIG_CRYPTO_AES=y
-# CONFIG_CRYPTO_AES_TI is not set
+CONFIG_CRYPTO_AES_TI=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARIA is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
+CONFIG_CRYPTO_CAMELLIA=m
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 CONFIG_CRYPTO_DES=m
@@ -8950,7 +8972,7 @@ CONFIG_CRYPTO_SM4_GENERIC=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CTR=m
-# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_HCTR2 is not set
 # CONFIG_CRYPTO_LRW is not set
diff --git a/device/testing/linux-postmarketos-asahi/pmos.config b/device/testing/linux-postmarketos-asahi/pmos.config
index a73fc1003..d5cb8a9e2 100644
--- a/device/testing/linux-postmarketos-asahi/pmos.config
+++ b/device/testing/linux-postmarketos-asahi/pmos.config
@@ -1,5 +1,6 @@
 # default
 # CONFIG_ANDROID_PARANOID_NETWORK is not set
+CONFIG_BINFMT_ELF=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_CGROUPS=y
 CONFIG_CRYPTO_AES=y
@@ -18,7 +19,6 @@ CONFIG_TMPFS_POSIX_ACL=y
 # CONFIG_USE_VFB is not set
 CONFIG_VT=y
 CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_SCRIPT=y
 CONFIG_UEVENT_HELPER=y
 CONFIG_USER_NS=y
@@ -44,6 +44,35 @@ CONFIG_SECURITYFS=y
 CONFIG_USER_NS=y
 CONFIG_UTS_NS=y
 
+# netmount
+CONFIG_CACHEFILES=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_FSCACHE=y
+CONFIG_NFSD=m
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_PNFS=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_V4_2_INTER_SSC=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_FSCACHE=y
+CONFIG_NFS_V3=m
+CONFIG_NFS_V4=m
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
+CONFIG_CRYPTO_AES_TI=m
+
 # waydroid
 # CONFIG_ANDROID_BINDERFS is not set
 CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
@@ -54,6 +83,7 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_BRIDGE=m
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_CGROUP_BPF=y
+CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_FUSE_FS=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_NETFILTER_XTABLES=m
@@ -65,7 +95,6 @@ CONFIG_TMPFS_XATTR=y
 CONFIG_TUN=m
 CONFIG_VETH=m
 CONFIG_VLAN_8021Q=m
-CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_IP_NF_IPTABLES_LEGACY=m
 CONFIG_NETFILTER_XTABLES_LEGACY=y
 
@@ -123,19 +152,29 @@ CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BRIDGE=m
 CONFIG_BRIDGE_NETFILTER=m
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_CGROUP_BPF=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_SCHED=y
+CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CPUSETS=y
+CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DUMMY=m
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
 CONFIG_IPC_NS=y
+CONFIG_IPVLAN=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_NAT=m
@@ -148,7 +187,9 @@ CONFIG_IP_VS_PROTO_TCP=y
 CONFIG_IP_VS_PROTO_UDP=y
 CONFIG_IP_VS_RR=m
 CONFIG_KEYS=y
+CONFIG_MACVLAN=m
 CONFIG_MD=y
+CONFIG_MEMCG=y
 CONFIG_NAMESPACES=y
 CONFIG_NETFILTER_XT_MARK=m
 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
@@ -158,35 +199,23 @@ CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NET_CLS_CGROUP=m
 CONFIG_NET_NS=y
 CONFIG_NET_SCHED=y
-CONFIG_NF_NAT=m
-CONFIG_PID_NS=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_UTS_NS=y
-CONFIG_VETH=m
-CONFIG_CFS_BANDWIDTH=y
-CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_MEMCG=y
-CONFIG_SWAP=y
-CONFIG_IP6_NF_TARGET_MASQUERADE=m
-CONFIG_VXLAN=m
-CONFIG_BRIDGE_VLAN_FILTERING=y
-CONFIG_MACVLAN=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_CT=m
-CONFIG_NFT_NAT=m
-CONFIG_NF_TABLES=m
-CONFIG_CGROUP_NET_PRIO=y
-CONFIG_IP6_NF_NAT=m
-CONFIG_NFT_MASQ=m
-CONFIG_OVERLAY_FS=m
-CONFIG_IPVLAN=m
-CONFIG_SECCOMP=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_BPF=y
 CONFIG_NFT_FIB=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NFT_FIB_IPV6=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_NAT=m
+CONFIG_NF_NAT=m
+CONFIG_NF_TABLES=m
+CONFIG_OVERLAY_FS=m
+CONFIG_PID_NS=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_SECCOMP=y
+CONFIG_SWAP=y
+CONFIG_UTS_NS=y
+CONFIG_VETH=m
+CONFIG_VXLAN=m
 CONFIG_IP6_NF_FILTER=m
 
 # zram
@@ -221,14 +250,14 @@ CONFIG_WIREGUARD=m
 # filesystems
 CONFIG_BTRFS_FS=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS=m
+CONFIG_EROFS_FS_ZIP=y
+CONFIG_EROFS_FS_ZIP_LZMA=y
 CONFIG_EXFAT_FS=m
 CONFIG_EXT4_FS=y
 CONFIG_F2FS_FS=y
 CONFIG_UDF_FS=m
 CONFIG_XFS_FS=m
-CONFIG_EROFS_FS=m
-CONFIG_EROFS_FS_ZIP=y
-CONFIG_EROFS_FS_ZIP_LZMA=y
 CONFIG_EROFS_FS_ZIP_DEFLATE=y
 CONFIG_EROFS_FS_ZIP_ZSTD=y
 
@@ -277,8 +306,8 @@ CONFIG_PSTORE=y
 CONFIG_VFAT_FS=y
 CONFIG_EFI_GENERIC_STUB=y
 CONFIG_EFI_PARAMS_FROM_FDT=y
-CONFIG_EFI_ZBOOT=y
 CONFIG_NTFS3_FS=m
+CONFIG_EFI_ZBOOT=y
 
 # input
 CONFIG_BT=m
@@ -454,10 +483,10 @@ CONFIG_DM_VERITY=m
 
 # hardening
 CONFIG_SECURITY_DMESG_RESTRICT=y
+CONFIG_SHADOW_CALL_STACK=y
 CONFIG_CFI=y
 # CONFIG_CFI_PERMISSIVE is not set
 CONFIG_CFI_ICALL_NORMALIZE_INTEGERS=y
-CONFIG_SHADOW_CALL_STACK=y
 
 # wine
 CONFIG_NTSYNC=m