diff --git a/x86_64_defconfig b/x86_64_defconfig
index 9bebcf2..3f55483 100644
--- a/x86_64_defconfig
+++ b/x86_64_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 6.12.8 Kernel Configuration
+# Linux/x86_64 6.12.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="Android (12701618, +pgo, +bolt, +lto, +mlgo, based on r536225) clang version 19.0.1 (https://android.googlesource.com/toolchain/llvm-project b3a530ec6537146650e42be89f1089e9a3588460)"
 CONFIG_GCC_VERSION=0
@@ -196,7 +196,8 @@ CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
 # CONFIG_MEMCG_V1 is not set
-# CONFIG_BLK_CGROUP is not set
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_GROUP_SCHED_WEIGHT=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -510,7 +511,6 @@ CONFIG_MITIGATION_RFDS=y
 CONFIG_MITIGATION_SPECTRE_BHI=y
 CONFIG_MITIGATION_MDS=y
 CONFIG_MITIGATION_TAA=y
-CONFIG_MITIGATION_TSA=y
 CONFIG_MITIGATION_MMIO_STALE_DATA=y
 CONFIG_MITIGATION_L1TF=y
 CONFIG_MITIGATION_RETBLEED=y
@@ -519,6 +519,7 @@ CONFIG_MITIGATION_SPECTRE_V2=y
 CONFIG_MITIGATION_SRBDS=y
 CONFIG_MITIGATION_SSB=y
 CONFIG_MITIGATION_ITS=y
+CONFIG_MITIGATION_TSA=y
 CONFIG_ARCH_HAS_ADD_PAGES=y
 
 #
@@ -881,13 +882,18 @@ CONFIG_MODPROBE_PATH="/sbin/modprobe"
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
 CONFIG_BLOCK_LEGACY_AUTOLOAD=y
+CONFIG_BLK_CGROUP_RWSTAT=y
 CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_ICQ=y
 CONFIG_BLK_DEV_BSGLIB=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 # CONFIG_BLK_DEV_ZONED is not set
+# CONFIG_BLK_DEV_THROTTLING is not set
 # CONFIG_BLK_WBT is not set
+# CONFIG_BLK_CGROUP_IOLATENCY is not set
+# CONFIG_BLK_CGROUP_IOCOST is not set
+# CONFIG_BLK_CGROUP_IOPRIO is not set
 CONFIG_BLK_DEBUG_FS=y
 # CONFIG_BLK_SED_OPAL is not set
 CONFIG_BLK_INLINE_ENCRYPTION=y
@@ -930,6 +936,8 @@ CONFIG_BLK_MQ_STACKING=y
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_IOSCHED_BFQ=y
+CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
 # end of IO Schedulers
 
 CONFIG_PADATA=y
@@ -1622,7 +1630,6 @@ CONFIG_BT_INTEL=m
 CONFIG_BT_BCM=m
 CONFIG_BT_RTL=m
 CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_SCOHCI=m
 # CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
 CONFIG_BT_HCIBTUSB_POLL_SYNC=y
 CONFIG_BT_HCIBTUSB_BCM=y
@@ -3296,8 +3303,8 @@ CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_CHERRYVIEW=y
 # CONFIG_PINCTRL_LYNXPOINT is not set
 CONFIG_PINCTRL_INTEL=y
-# CONFIG_PINCTRL_INTEL_PLATFORM is not set
-# CONFIG_PINCTRL_ALDERLAKE is not set
+CONFIG_PINCTRL_INTEL_PLATFORM=y
+CONFIG_PINCTRL_ALDERLAKE=y
 CONFIG_PINCTRL_BROXTON=y
 CONFIG_PINCTRL_CANNONLAKE=m
 # CONFIG_PINCTRL_CEDARFORK is not set
@@ -3709,7 +3716,17 @@ CONFIG_PROC_THERMAL_MMIO_RAPL=y
 #
 # Trusty driver
 #
-# CONFIG_TRUSTY is not set
+CONFIG_TRUSTY=y
+# CONFIG_TRUSTY_IRQ is not set
+CONFIG_TRUSTY_LOG=y
+CONFIG_TRUSTY_TEST=y
+CONFIG_TRUSTY_VIRTIO=y
+CONFIG_TRUSTY_VIRTIO_IPC=y
+# CONFIG_TRUSTY_DMA_BUF_FFA_TAG is not set
+# CONFIG_TRUSTY_DMA_BUF_SHARED_MEM_ID is not set
+# CONFIG_TRUSTY_CRASH_IS_PANIC is not set
+CONFIG_TRUSTY_X86_64=y
+CONFIG_TRUSTY_BACKUP_TIMER=y
 # end of Trusty driver
 
 CONFIG_WATCHDOG=y
@@ -4531,7 +4548,7 @@ CONFIG_DRM_I915_USERPTR=y
 # CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
 # CONFIG_DRM_I915_DEBUG_GUC is not set
 # CONFIG_DRM_I915_SELFTEST is not set
-# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
+CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS=y
 # CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
 # CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
 # CONFIG_DRM_I915_DEBUG_WAKEREF is not set
@@ -4889,6 +4906,7 @@ CONFIG_SND_USB_HIFACE=m
 # CONFIG_SND_USB_PODHD is not set
 # CONFIG_SND_USB_TONEPORT is not set
 # CONFIG_SND_USB_VARIAX is not set
+CONFIG_BT_SCOHCI=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_COMPRESS=y
 CONFIG_SND_SOC_TOPOLOGY=y
@@ -5718,7 +5736,6 @@ CONFIG_UCSI_CCG=y
 CONFIG_UCSI_ACPI=y
 # CONFIG_UCSI_STM32G0 is not set
 CONFIG_TYPEC_TPS6598X=y
-
 # CONFIG_TYPEC_ANX7411 is not set
 # CONFIG_TYPEC_RT1719 is not set
 # CONFIG_TYPEC_HD3SS3220 is not set
@@ -6119,7 +6136,6 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
 #
 # Android
 #
-CONFIG_ANDROID=y
 CONFIG_ANDROID_STAGING=y
 CONFIG_ASHMEM=y
 CONFIG_ASHMEM_C=y
@@ -7113,7 +7129,7 @@ CONFIG_INTEL_TH_PTI=y
 # end of HW tracing support
 
 # CONFIG_FPGA is not set
-# CONFIG_TEE is not set
+CONFIG_TEE=y
 CONFIG_PM_OPP=y
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
@@ -7159,6 +7175,7 @@ CONFIG_F2FS_FS_SECURITY=y
 # CONFIG_F2FS_FAULT_INJECTION is not set
 # CONFIG_F2FS_FS_COMPRESSION is not set
 CONFIG_F2FS_IOSTAT=y
+CONFIG_F2FS_UNFAIR_RWSEM=y
 # CONFIG_BCACHEFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
@@ -8012,9 +8029,9 @@ CONFIG_HARDLOCKUP_DETECTOR_COUNTS_HRTIMER=y
 CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
 CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DETECT_HUNG_TASK_BLOCKER=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
+CONFIG_DETECT_HUNG_TASK_BLOCKER=y
 # CONFIG_WQ_WATCHDOG is not set
 # CONFIG_WQ_CPU_INTENSIVE_REPORT is not set
 # CONFIG_TEST_LOCKUP is not set