From 6956661bf5f5011f607d2c0da8dc970e5c946b5d Mon Sep 17 00:00:00 2001
From: clown <458892+aieu@users.noreply.github.com>
Date: Tue, 4 Feb 2025 17:32:53 +0800
Subject: [PATCH] kernel: 6.12.y for x230

---
 x230/{x230_6.6_defconfig => x230_6.12_defconfig} | 20 ++++++++------------
 x230/x230_6.6_defconfig                          |  3 +++
 2 files changed, 11 insertions(+), 12 deletions(-)
 copy x230/{x230_6.6_defconfig => x230_6.12_defconfig} (98%)

diff --git a/x230/x230_6.6_defconfig b/x230/x230_6.12_defconfig
similarity index 98%
copy from x230/x230_6.6_defconfig
copy to x230/x230_6.12_defconfig
index 9689307..891fd1a 100644
--- a/x230/x230_6.6_defconfig
+++ b/x230/x230_6.12_defconfig
@@ -10,6 +10,7 @@ CONFIG_BPF_JIT=y
 CONFIG_PREEMPT=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_IKCONFIG=y
@@ -33,7 +34,6 @@ CONFIG_SCHED_AUTOGROUP=y
 CONFIG_EXPERT=y
 CONFIG_PROFILING=y
 CONFIG_KEXEC=y
-CONFIG_CRASH_DUMP=y
 CONFIG_SMP=y
 CONFIG_X86_X2APIC=y
 # CONFIG_X86_EXTENDED_PLATFORM is not set
@@ -61,7 +61,7 @@ CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 # CONFIG_MTRR_SANITIZER is not set
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
-CONFIG_EFI_FAKE_MEMMAP=y
+# CONFIG_EFI_HANDOVER_PROTOCOL is not set
 # CONFIG_RANDOMIZE_BASE is not set
 CONFIG_PM_DEBUG=y
 CONFIG_PM_ADVANCED_DEBUG=y
@@ -85,7 +85,6 @@ CONFIG_JUMP_LABEL=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODULE_COMPRESS_ZSTD=y
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEBUG_FS is not set
 CONFIG_PARTITION_ADVANCED=y
@@ -124,6 +123,7 @@ CONFIG_INET6_ESP=m
 CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_MPTCP=y
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NETFILTER=y
 CONFIG_BRIDGE_NETFILTER=m
@@ -290,7 +290,6 @@ CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NFT_DUP_IPV6=m
@@ -398,7 +397,9 @@ CONFIG_CONNECTOR=y
 CONFIG_EFI_BOOTLOADER_CONTROL=y
 # CONFIG_PNP_DEBUG_MESSAGES is not set
 CONFIG_ZRAM=m
-CONFIG_ZRAM_DEF_COMP_LZ4=y
+CONFIG_ZRAM_BACKEND_LZ4=y
+CONFIG_ZRAM_BACKEND_ZSTD=y
+CONFIG_ZRAM_BACKEND_LZO=y
 CONFIG_ZRAM_WRITEBACK=y
 CONFIG_ZRAM_MEMORY_TRACKING=y
 CONFIG_BLK_DEV_LOOP=m
@@ -516,7 +517,6 @@ CONFIG_PPP_SYNC_TTY=m
 # CONFIG_WLAN_VENDOR_ATH is not set
 # CONFIG_WLAN_VENDOR_ATMEL is not set
 # CONFIG_WLAN_VENDOR_BROADCOM is not set
-# CONFIG_WLAN_VENDOR_CISCO is not set
 CONFIG_IWLWIFI=m
 CONFIG_IWLDVM=m
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
@@ -537,7 +537,6 @@ CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_INPUT_LEDS=m
 CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_SPARSEKMAP=m
 CONFIG_INPUT_MOUSEDEV=m
 CONFIG_INPUT_EVDEV=m
 CONFIG_KEYBOARD_ATKBD=m
@@ -562,7 +561,6 @@ CONFIG_HPET=y
 CONFIG_TCG_TPM=m
 # CONFIG_HW_RANDOM_TPM is not set
 CONFIG_TCG_TIS=m
-# CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_MUX=m
 # CONFIG_I2C_HELPER_AUTO is not set
 CONFIG_I2C_I801=m
@@ -590,7 +588,6 @@ CONFIG_USB_VIDEO_CLASS=m
 CONFIG_AGP=y
 CONFIG_AGP_INTEL=y
 CONFIG_DRM=y
-CONFIG_DRM_DP_AUX_CHARDEV=y
 CONFIG_DRM_I915=y
 CONFIG_DRM_VIRTIO_GPU=m
 CONFIG_FB=y
@@ -636,7 +633,6 @@ CONFIG_MMC_SDHCI_ACPI=m
 CONFIG_MMC_VIA_SDMMC=m
 CONFIG_MMC_USHC=m
 CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_TRIGGER_AUDIO=y
 CONFIG_RTC_CLASS=y
 CONFIG_DMADEVICES=y
 CONFIG_VIRTIO_PCI=m
@@ -704,7 +700,8 @@ CONFIG_KEY_DH_OPERATIONS=y
 # CONFIG_SECURITYFS is not set
 CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_SM2=m
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_ECDSA=m
 CONFIG_CRYPTO_CURVE25519=m
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_SM4_GENERIC=m
@@ -721,7 +718,6 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 CONFIG_CRYPTO_USER_API_RNG=m
 CONFIG_CRYPTO_USER_API_AEAD=m
-CONFIG_CRYPTO_STATS=y
 CONFIG_CRYPTO_AES_NI_INTEL=y
 CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64=m
 CONFIG_CRYPTO_SHA1_SSSE3=m
diff --git a/x230/x230_6.6_defconfig b/x230/x230_6.6_defconfig
index 9689307..7e4dcfc 100644
--- a/x230/x230_6.6_defconfig
+++ b/x230/x230_6.6_defconfig
@@ -10,6 +10,7 @@ CONFIG_BPF_JIT=y
 CONFIG_PREEMPT=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_IKCONFIG=y
@@ -61,6 +62,7 @@ CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 # CONFIG_MTRR_SANITIZER is not set
 CONFIG_EFI=y
 CONFIG_EFI_STUB=y
+# CONFIG_EFI_HANDOVER_PROTOCOL is not set
 CONFIG_EFI_FAKE_MEMMAP=y
 # CONFIG_RANDOMIZE_BASE is not set
 CONFIG_PM_DEBUG=y
@@ -124,6 +126,7 @@ CONFIG_INET6_ESP=m
 CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_MPTCP=y
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NETFILTER=y
 CONFIG_BRIDGE_NETFILTER=m
-- 
2.11.4.GIT