From 665cd49275b8daedc152290703ce3f4ea1786f97 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Mon, 24 Feb 2025 12:06:18 +0100 Subject: [PATCH] coreos-modules: Sort config options Signed-off-by: Jeremi Piotrowski --- .../coreos-modules/files/amd64_defconfig-6.6 | 2 +- .../coreos-modules/files/commonconfig-6.6 | 116 +++++++++--------- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 index 7ff0ac660f..7ed67fe1d1 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 @@ -56,6 +56,7 @@ CONFIG_HW_RANDOM_INTEL=y CONFIG_HW_RANDOM_VIA=y CONFIG_HYPERVISOR_GUEST=y CONFIG_IA32_EMULATION=y +CONFIG_IGC=m CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_INFINIBAND_USNIC=m CONFIG_INT340X_THERMAL=m @@ -71,7 +72,6 @@ CONFIG_ISCSI_IBFT=y CONFIG_ISCSI_IBFT_FIND=y CONFIG_ITCO_VENDOR_SUPPORT=y CONFIG_ITCO_WDT=m -CONFIG_IGC=m CONFIG_KERNEL_ZSTD=y CONFIG_KEXEC_FILE=y CONFIG_KPROBES_ON_FTRACE=y 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 9f54dd65f9..4b065d16b6 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 @@ -124,25 +124,25 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m CONFIG_CPU_FREQ_STAT=y # CONFIG_CROSS_MEMORY_ATTACH is not set +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_CTR=m CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_FIPS=y CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_LIB_DES=m CONFIG_CRYPTO_LIB_AES=m +CONFIG_CRYPTO_LIB_DES=m CONFIG_CRYPTO_LIB_GF128MUL=m CONFIG_CRYPTO_LZO=m # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_NULL2=m CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_SKCIPHER=m -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 @@ -171,6 +171,7 @@ CONFIG_DM_ZERO=m CONFIG_DNS_RESOLVER=y CONFIG_DRM=m CONFIG_DRM_VIRTIO_GPU=m +CONFIG_DST_CACHE=y CONFIG_DUMMY=m CONFIG_DYNAMIC_DEBUG=y CONFIG_E100=m @@ -219,8 +220,8 @@ CONFIG_GACT_PROB=y CONFIG_GENEVE=m CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y +CONFIG_GRO_CELLS=y CONFIG_GTP=m -CONFIG_MACSEC=m CONFIG_HARDENED_USERCOPY=y CONFIG_HIDRAW=y CONFIG_HID_A4TECH=m @@ -417,9 +418,9 @@ CONFIG_ISCSI_TARGET=m CONFIG_ISCSI_TCP=m CONFIG_ISO9660_FS=m CONFIG_IXGBE=m -CONFIG_IXGBE_IPSEC=y -CONFIG_IXGBEVF_IPSEC=y CONFIG_IXGBEVF=m +CONFIG_IXGBEVF_IPSEC=y +CONFIG_IXGBE_IPSEC=y CONFIG_JME=m CONFIG_JOLIET=y CONFIG_JUMP_LABEL=y @@ -442,13 +443,9 @@ 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=m -CONFIG_NET_IFE=m CONFIG_LWTUNNEL=y CONFIG_LWTUNNEL_BPF=y -CONFIG_DST_CACHE=y -CONFIG_GRO_CELLS=y -CONFIG_SOCK_VALIDATE_XMIT=y +CONFIG_MACSEC=m CONFIG_MACVLAN=m CONFIG_MACVTAP=m CONFIG_MAGIC_SYSRQ=y @@ -468,24 +465,27 @@ CONFIG_MINIX_SUBPARTITION=y # CONFIG_MLX4_DEBUG is not set CONFIG_MLX4_EN=m CONFIG_MLX4_INFINIBAND=m -CONFIG_MLX5_CORE=m -CONFIG_MLX5_CORE_EN=y -CONFIG_MLX5_EN_ARFS=y -CONFIG_MLX5_EN_RXNFC=y -CONFIG_MLX5_MPFS=y -CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_BRIDGE=y CONFIG_MLX5_CLS_ACT=y -CONFIG_MLX5_TC_CT=y -CONFIG_MLX5_TC_SAMPLE=y +CONFIG_MLX5_CORE=m +CONFIG_MLX5_CORE_EN=y CONFIG_MLX5_CORE_EN_DCB=y -CONFIG_MLX5_MACSEC=y +CONFIG_MLX5_EN_ARFS=y CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_EN_RXNFC=y CONFIG_MLX5_EN_TLS=y -CONFIG_MLX5_SW_STEERING=y +CONFIG_MLX5_ESWITCH=y +CONFIG_MLX5_INFINIBAND=m +CONFIG_MLX5_MACSEC=y +CONFIG_MLX5_MPFS=y CONFIG_MLX5_SF=y CONFIG_MLX5_SF_MANAGER=y -CONFIG_MLX5_INFINIBAND=m +CONFIG_MLX5_SW_STEERING=y +CONFIG_MLX5_TC_CT=y +CONFIG_MLX5_TC_SAMPLE=y +CONFIG_MLX5_VDPA=y +CONFIG_MLX5_VDPA_NET=m +CONFIG_MLX5_VFIO_PCI=m CONFIG_MMC=m CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=16 @@ -589,34 +589,33 @@ CONFIG_NET_9P=m # CONFIG_NET_9P_DEBUG is not set CONFIG_NET_9P_RDMA=m CONFIG_NET_9P_VIRTIO=m -CONFIG_NET_ACT_CSUM=m -CONFIG_NET_ACT_MPLS=m -CONFIG_NET_ACT_GACT=m -CONFIG_NET_ACT_IPT=m -CONFIG_NET_ACT_MIRRED=m -CONFIG_NET_ACT_SAMPLE=m -CONFIG_NET_ACT_NAT=m -CONFIG_NET_ACT_PEDIT=m -CONFIG_NET_ACT_SIMP=m -CONFIG_NET_ACT_POLICE=m -CONFIG_NET_ACT_SKBEDIT=m -CONFIG_NET_ACT_VLAN=m CONFIG_NET_ACT_BPF=m CONFIG_NET_ACT_CONNMARK=m -CONFIG_NET_ACT_CTINFO=m -CONFIG_NET_ACT_SKBMOD=m -CONFIG_NET_ACT_IFE=m -CONFIG_NET_ACT_TUNNEL_KEY=m +CONFIG_NET_ACT_CSUM=m CONFIG_NET_ACT_CT=m +CONFIG_NET_ACT_CTINFO=m +CONFIG_NET_ACT_GACT=m CONFIG_NET_ACT_GATE=m -CONFIG_NET_TC_SKB_EXT=y +CONFIG_NET_ACT_IFE=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_MPLS=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_SAMPLE=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_ACT_SKBMOD=m +CONFIG_NET_ACT_TUNNEL_KEY=m +CONFIG_NET_ACT_VLAN=m # 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=m CONFIG_NET_CLS_CGROUP=m CONFIG_NET_CLS_FLOW=m +CONFIG_NET_CLS_FLOWER=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_U32=m @@ -628,6 +627,7 @@ CONFIG_NET_EMATCH_NBYTE=m CONFIG_NET_EMATCH_TEXT=m CONFIG_NET_EMATCH_U32=m CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_NET_IFE=m CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE_BROADCAST=y CONFIG_NET_IPGRE_DEMUX=m @@ -659,6 +659,7 @@ CONFIG_NET_SCH_SFB=m CONFIG_NET_SCH_SFQ=m CONFIG_NET_SCH_TBF=m CONFIG_NET_SCH_TEQL=m +CONFIG_NET_TC_SKB_EXT=y CONFIG_NET_TULIP=y # CONFIG_NET_VENDOR_3COM is not set # CONFIG_NET_VENDOR_ADAPTEC is not set @@ -697,29 +698,28 @@ CONFIG_NFT_BRIDGE_META=m CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NFT_COMPAT=m CONFIG_NFT_CT=m -CONFIG_NFT_FLOW_OFFLOAD=m CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_FIB=m CONFIG_NFT_FIB_INET=m -CONFIG_NFT_XFRM=m CONFIG_NFT_FIB_IPV4=m CONFIG_NFT_FIB_IPV6=m CONFIG_NFT_FIB_NETDEV=m +CONFIG_NFT_FLOW_OFFLOAD=m CONFIG_NFT_FWD_NETDEV=m -CONFIG_NF_FLOW_TABLE=m CONFIG_NFT_HASH=m CONFIG_NFT_LIMIT=m CONFIG_NFT_LOG=m CONFIG_NFT_MASQ=m CONFIG_NFT_NAT=m -CONFIG_NFT_TUNNEL=m CONFIG_NFT_NUMGEN=m CONFIG_NFT_QUEUE=m CONFIG_NFT_QUOTA=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT=m +CONFIG_NFT_TUNNEL=m +CONFIG_NFT_XFRM=m CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_BRIDGE=m @@ -742,6 +742,7 @@ CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK_TIMEOUT=m CONFIG_NF_CT_PROTO_UDPLITE=y +CONFIG_NF_FLOW_TABLE=m CONFIG_NF_LOG_ARP=m CONFIG_NF_SOCKET_IPV4=m CONFIG_NF_SOCKET_IPV6=m @@ -803,6 +804,7 @@ CONFIG_PRINTK_TIME=y # CONFIG_PRINT_QUOTA_WARNING is not set CONFIG_PROC_KCORE=y CONFIG_PROFILING=y +CONFIG_PSAMPLE=m CONFIG_PSI=y # CONFIG_PSI_DEFAULT_DISABLED is not set CONFIG_PTP_1588_CLOCK=m @@ -900,6 +902,7 @@ CONFIG_SKY2=m CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SMP=y +CONFIG_SOCK_VALIDATE_XMIT=y CONFIG_SOFTLOCKUP_DETECTOR=y CONFIG_SOFT_WATCHDOG=m CONFIG_SOLARIS_X86_PARTITION=y @@ -942,8 +945,6 @@ CONFIG_TIGON3=m CONFIG_TLS=m CONFIG_TLS_DEVICE=y CONFIG_TLS_TOE=y -CONFIG_XFRM=yes -CONFIG_XFRM_OFFLOAD=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TRANSPARENT_HUGEPAGE=y @@ -977,18 +978,18 @@ CONFIG_USB_UHCI_HCD=m CONFIG_USB_USBNET=m CONFIG_USB_XHCI_HCD=m CONFIG_USER_NS=y +CONFIG_VDPA=m CONFIG_VETH=m CONFIG_VFAT_FS=m CONFIG_VFIO=m CONFIG_VFIO_PCI=m -CONFIG_VHOST_NET=m CONFIG_VFIO_PCI_CORE=m -CONFIG_VFIO_PCI_MMAP=y -CONFIG_VFIO_PCI_INTX=y -CONFIG_VFIO_PCI_VGA=y CONFIG_VFIO_PCI_IGD=y -CONFIG_MLX5_VFIO_PCI=m +CONFIG_VFIO_PCI_INTX=y +CONFIG_VFIO_PCI_MMAP=y +CONFIG_VFIO_PCI_VGA=y CONFIG_VHOST_IOTLB=m +CONFIG_VHOST_NET=m CONFIG_VHOST_RING=m CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y @@ -1002,9 +1003,6 @@ CONFIG_VIRTIO_NET=m CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRT_DRIVERS=y -CONFIG_VDPA=m -CONFIG_MLX5_VDPA=y -CONFIG_MLX5_VDPA_NET=m CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y @@ -1024,7 +1022,9 @@ CONFIG_XEN_NETDEV_BACKEND=m CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_XEN_SCSI_FRONTEND=m CONFIG_XEN_WDT=m +CONFIG_XFRM=y CONFIG_XFRM_MIGRATE=y +CONFIG_XFRM_OFFLOAD=y CONFIG_XFRM_STATISTICS=y CONFIG_XFRM_SUB_POLICY=y CONFIG_XFRM_USER=m