From 2a1b719b49941b055287215592a653360e49c08f Mon Sep 17 00:00:00 2001
From: Kernel Build Daemon <kbuild@suse.de>
Date: Apr 16 2024 10:13:43 +0000
Subject: Merge branch 'master-vanilla-configs' into vanilla


---

diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index 487739a..8ed5173 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -2733,7 +2733,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 CONFIG_MTD_UBI_GLUEBI=m
 CONFIG_MTD_UBI_BLOCK=y
 # CONFIG_MTD_UBI_FAULT_INJECTION is not set
-CONFIG_MTD_UBI_NVMEM=m
+# CONFIG_MTD_UBI_NVMEM is not set
 CONFIG_MTD_HYPERBUS=m
 CONFIG_DTC=y
 CONFIG_OF=y
@@ -5936,7 +5936,7 @@ CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NZXT_KRAKEN2=m
-CONFIG_SENSORS_NZXT_KRAKEN3=m
+# CONFIG_SENSORS_NZXT_KRAKEN3 is not set
 CONFIG_SENSORS_NZXT_SMART2=m
 # CONFIG_SENSORS_OCC_P8_I2C is not set
 CONFIG_SENSORS_PCF8591=m
@@ -11785,7 +11785,7 @@ CONFIG_ZOPT2201=m
 #
 # Magnetometer sensors
 #
-CONFIG_AF8133J=m
+# CONFIG_AF8133J is not set
 CONFIG_AK8974=m
 # CONFIG_AK8975 is not set
 # CONFIG_AK09911 is not set
@@ -13279,7 +13279,7 @@ CONFIG_CRYPTO_DEV_QAT_420XX=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
 CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
 CONFIG_CRYPTO_DEV_QAT_C62XVF=m
-CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION=y
+# CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION is not set
 CONFIG_CRYPTO_DEV_CAVIUM_ZIP=m
 CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_CRYPTO_DEV_QCE_SKCIPHER=y
diff --git a/config/armv6hl/vanilla b/config/armv6hl/vanilla
index ae32498..72c9dbb 100644
--- a/config/armv6hl/vanilla
+++ b/config/armv6hl/vanilla
@@ -4589,7 +4589,7 @@ CONFIG_NET_DSA_MV88E6060=m
 CONFIG_NET_DSA_MV88E6XXX=m
 CONFIG_NET_DSA_MV88E6XXX_PTP=y
 CONFIG_NET_DSA_QCA8K=m
-CONFIG_NET_DSA_REALTEK_SMI=m
+CONFIG_NET_DSA_REALTEK_SMI=y
 CONFIG_NET_DSA_SJA1105=m
 CONFIG_NET_DSA_SJA1105_PTP=y
 CONFIG_NET_DSA_SJA1105_TAS=y
@@ -7262,7 +7262,7 @@ CONFIG_MFD_SIMPLE_MFD_I2C=m
 CONFIG_MT7921U=m
 CONFIG_MTD_NAND_ECC_MXIC=y
 CONFIG_NET_DSA_REALTEK=m
-CONFIG_NET_DSA_REALTEK_MDIO=m
+CONFIG_NET_DSA_REALTEK_MDIO=y
 CONFIG_NET_DSA_REALTEK_RTL8365MB=m
 CONFIG_NET_DSA_REALTEK_RTL8366RB=m
 CONFIG_NET_VENDOR_DAVICOM=y
@@ -7929,3 +7929,68 @@ CONFIG_VIDEO_OV64A40=m
 CONFIG_VIDEO_THP7312=m
 CONFIG_VIDEO_TW9900=m
 CONFIG_W1_MASTER_AMD_AXI=m
+# CONFIG_AF8133J is not set
+# CONFIG_HIBERNATION_COMP_LZ4 is not set
+# CONFIG_MTD_UBI_NVMEM is not set
+# CONFIG_SENSORS_NZXT_KRAKEN3 is not set
+CONFIG_ADMFM2000=m
+CONFIG_ARCH_HAS_CPU_CACHE_ALIASING=y
+CONFIG_ARCH_HAS_UBSAN=y
+CONFIG_ARM_DEBUG_WX=y
+CONFIG_BACKLIGHT_KTD2801=m
+CONFIG_BMI088_ACCEL_I2C=m
+CONFIG_BRIDGE_NF_EBTABLES_LEGACY=m
+CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y
+CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y
+CONFIG_CRASH_RESERVE=y
+CONFIG_CROS_EC_WATCHDOG=m
+CONFIG_DRM_DISPLAY_HDMI_HELPER=y
+CONFIG_DRM_DW_HDMI=m
+CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
+CONFIG_DRM_DW_HDMI_CEC=m
+CONFIG_DRM_DW_HDMI_GP_AUDIO=m
+CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE=m
+CONFIG_DRM_IMX8MP_HDMI_PVI=m
+CONFIG_DRM_PANEL_BOE_TH101MB31UIG002_28A=m
+CONFIG_DRM_PANEL_HIMAX_HX83112A=m
+CONFIG_DRM_PANEL_NOVATEK_NT36672E=m
+CONFIG_FUSE_PASSTHROUGH=y
+CONFIG_GPIO_CROS_EC=m
+CONFIG_HAVE_PAGE_SIZE_4KB=y
+CONFIG_HIBERNATION_COMP_LZO=y
+CONFIG_HIBERNATION_DEF_COMP="lzo"
+CONFIG_IIO_BACKEND=m
+CONFIG_IP6_NF_IPTABLES_LEGACY=m
+CONFIG_IP_NF_IPTABLES_LEGACY=m
+CONFIG_LEDS_EXPRESSWIRE=y
+CONFIG_LEDS_NCP5623=m
+CONFIG_MAX6959=m
+CONFIG_NFT_COMPAT_ARP=m
+CONFIG_PAC1934=m
+CONFIG_PAGE_SHIFT=12
+CONFIG_PAGE_SIZE_4KB=y
+CONFIG_PINCTRL_AW9523=m
+CONFIG_PTP_1588_CLOCK_FC3W=m
+CONFIG_QCA807X_PHY=m
+CONFIG_QCA808X_PHY=m
+CONFIG_QCA83XX_PHY=m
+CONFIG_QCOM_NET_PHYLIB=m
+CONFIG_RESET_GPIO=m
+CONFIG_SCREEN_INFO=y
+CONFIG_SEG_LED_GPIO=m
+CONFIG_SENSORS_ASUS_ROG_RYUJIN=m
+CONFIG_SENSORS_CHIPCAP2=m
+CONFIG_SENSORS_LTC4282=m
+CONFIG_SENSORS_MPQ8785=m
+CONFIG_SENSORS_PT5161L=m
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
+CONFIG_TI_ADS1298=m
+CONFIG_TOUCHSCREEN_GOODIX_BERLIN_CORE=m
+CONFIG_TOUCHSCREEN_GOODIX_BERLIN_I2C=m
+CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI=m
+CONFIG_TYPEC_MUX_IT5205=m
+CONFIG_USB_DEFAULT_AUTHORIZATION_MODE=1
+CONFIG_VIDEO=y
+CONFIG_VMCORE_INFO=y
+CONFIG_W1_MASTER_UART=m
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index 411070c..9c4d1c2 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -517,7 +517,7 @@ CONFIG_OMAP5_ERRATA_801819=y
 # end of TI OMAP/AM/DM/DRA Family
 
 CONFIG_ARCH_QCOM=y
-CONFIG_ARCH_QCOM_RESERVE_SMEM=y
+# CONFIG_ARCH_QCOM_RESERVE_SMEM is not set
 CONFIG_ARCH_REALTEK=y
 CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_PLAT_SAMSUNG is not set
@@ -2661,7 +2661,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 CONFIG_MTD_UBI_GLUEBI=m
 # CONFIG_MTD_UBI_BLOCK is not set
 # CONFIG_MTD_UBI_FAULT_INJECTION is not set
-CONFIG_MTD_UBI_NVMEM=m
+# CONFIG_MTD_UBI_NVMEM is not set
 CONFIG_MTD_HYPERBUS=m
 CONFIG_DTC=y
 CONFIG_OF=y
@@ -5613,7 +5613,7 @@ CONFIG_SENSORS_NCT6775_I2C=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NZXT_KRAKEN2=m
-CONFIG_SENSORS_NZXT_KRAKEN3=m
+# CONFIG_SENSORS_NZXT_KRAKEN3 is not set
 CONFIG_SENSORS_NZXT_SMART2=m
 # CONFIG_SENSORS_OCC_P8_I2C is not set
 CONFIG_SENSORS_PCF8591=m
@@ -7374,14 +7374,14 @@ CONFIG_DRM_XE_FORCE_PROBE=""
 #
 # drm/Xe Debugging
 #
-CONFIG_DRM_XE_WERROR=y
-CONFIG_DRM_XE_DEBUG=y
-CONFIG_DRM_XE_DEBUG_VM=y
-CONFIG_DRM_XE_DEBUG_SRIOV=y
-CONFIG_DRM_XE_DEBUG_MEM=y
+# CONFIG_DRM_XE_WERROR is not set
+# CONFIG_DRM_XE_DEBUG is not set
+# CONFIG_DRM_XE_DEBUG_VM is not set
+# CONFIG_DRM_XE_DEBUG_SRIOV is not set
+# CONFIG_DRM_XE_DEBUG_MEM is not set
 CONFIG_DRM_XE_SIMPLE_ERROR_CAPTURE=y
-CONFIG_DRM_XE_LARGE_GUC_BUFFER=y
-CONFIG_DRM_XE_USERPTR_INVAL_INJECT=y
+# CONFIG_DRM_XE_LARGE_GUC_BUFFER is not set
+# CONFIG_DRM_XE_USERPTR_INVAL_INJECT is not set
 # end of drm/Xe Debugging
 
 #
@@ -11101,7 +11101,7 @@ CONFIG_ZOPT2201=m
 #
 # Magnetometer sensors
 #
-CONFIG_AF8133J=m
+# CONFIG_AF8133J is not set
 CONFIG_AK8974=m
 CONFIG_AK8975=m
 CONFIG_AK09911=m
@@ -12504,7 +12504,7 @@ CONFIG_CRYPTO_DEV_QAT_420XX=m
 # CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set
 # CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
 # CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
-CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION=y
+# CONFIG_CRYPTO_DEV_QAT_ERROR_INJECTION is not set
 CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_CRYPTO_DEV_QCE_SKCIPHER=y
 CONFIG_CRYPTO_DEV_QCE_SHA=y