From 9b5acab7603c370fd4ab768434b6334af9f2e02b Mon Sep 17 00:00:00 2001
From: Jeremi Piotrowski <jpiotrowski@microsoft.com>
Date: Mon, 24 Feb 2025 11:59:33 +0100
Subject: [PATCH] coreos-modules: Switch as many new options as possible to
 modules

Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
---
 .../coreos-modules/files/commonconfig-6.6     | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6
index fecb3c060e..9f54dd65f9 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6
+++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6
@@ -130,19 +130,19 @@ CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_GCM=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_GF128MUL=y
+CONFIG_CRYPTO_LIB_AES=m
+CONFIG_CRYPTO_LIB_GF128MUL=m
 CONFIG_CRYPTO_LZO=m
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
-CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_NULL2=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_CTR=y
-CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_GHASH=y
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_NULL2=m
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_GHASH=m
 CONFIG_CUSE=m
 CONFIG_DCB=y
 CONFIG_DEBUG_FS=y
@@ -220,7 +220,7 @@ CONFIG_GENEVE=m
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GTP=m
-CONFIG_MACSEC=y
+CONFIG_MACSEC=m
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_HIDRAW=y
 CONFIG_HID_A4TECH=m
@@ -442,8 +442,8 @@ CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LOOPBACK_TARGET=m
 CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
-CONFIG_PSAMPLE=y
-CONFIG_NET_IFE=y
+CONFIG_PSAMPLE=m
+CONFIG_NET_IFE=m
 CONFIG_LWTUNNEL=y
 CONFIG_LWTUNNEL_BPF=y
 CONFIG_DST_CACHE=y
@@ -594,7 +594,7 @@ CONFIG_NET_ACT_MPLS=m
 CONFIG_NET_ACT_GACT=m
 CONFIG_NET_ACT_IPT=m
 CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_SAMPLE=y
+CONFIG_NET_ACT_SAMPLE=m
 CONFIG_NET_ACT_NAT=m
 CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
@@ -605,16 +605,16 @@ CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
 CONFIG_NET_ACT_CTINFO=m
 CONFIG_NET_ACT_SKBMOD=m
-CONFIG_NET_ACT_IFE=y
-CONFIG_NET_ACT_TUNNEL_KEY=y
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
 CONFIG_NET_ACT_CT=m
-CONFIG_NET_ACT_GATE=y
+CONFIG_NET_ACT_GATE=m
 CONFIG_NET_TC_SKB_EXT=y
 # CONFIG_NET_CADENCE is not set
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_CLS_BASIC=m
 CONFIG_NET_CLS_BPF=m
-CONFIG_NET_CLS_FLOWER=y
+CONFIG_NET_CLS_FLOWER=m
 CONFIG_NET_CLS_CGROUP=m
 CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_FW=m
@@ -939,7 +939,7 @@ CONFIG_TCP_CONG_HYBLA=m
 # CONFIG_TCP_CONG_WESTWOOD is not set
 CONFIG_TCP_MD5SIG=y
 CONFIG_TIGON3=m
-CONFIG_TLS=y
+CONFIG_TLS=m
 CONFIG_TLS_DEVICE=y
 CONFIG_TLS_TOE=y
 CONFIG_XFRM=yes
@@ -988,7 +988,7 @@ CONFIG_VFIO_PCI_INTX=y
 CONFIG_VFIO_PCI_VGA=y
 CONFIG_VFIO_PCI_IGD=y
 CONFIG_MLX5_VFIO_PCI=m
-CONFIG_VHOST_IOTLB=y
+CONFIG_VHOST_IOTLB=m
 CONFIG_VHOST_RING=m
 CONFIG_VIA_RHINE=m
 CONFIG_VIA_RHINE_MMIO=y
@@ -1002,7 +1002,7 @@ CONFIG_VIRTIO_NET=m
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRT_DRIVERS=y
-CONFIG_VDPA=y
+CONFIG_VDPA=m
 CONFIG_MLX5_VDPA=y
 CONFIG_MLX5_VDPA_NET=m
 CONFIG_VLAN_8021Q=m