Skip to content

Commit 665cd49

Browse files
jepiochewi
authored andcommitted
coreos-modules: Sort config options
Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
1 parent 9b5acab commit 665cd49

2 files changed

Lines changed: 51 additions & 51 deletions

File tree

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ CONFIG_HW_RANDOM_INTEL=y
5656
CONFIG_HW_RANDOM_VIA=y
5757
CONFIG_HYPERVISOR_GUEST=y
5858
CONFIG_IA32_EMULATION=y
59+
CONFIG_IGC=m
5960
CONFIG_INFINIBAND_USER_ACCESS=m
6061
CONFIG_INFINIBAND_USNIC=m
6162
CONFIG_INT340X_THERMAL=m
@@ -71,7 +72,6 @@ CONFIG_ISCSI_IBFT=y
7172
CONFIG_ISCSI_IBFT_FIND=y
7273
CONFIG_ITCO_VENDOR_SUPPORT=y
7374
CONFIG_ITCO_WDT=m
74-
CONFIG_IGC=m
7575
CONFIG_KERNEL_ZSTD=y
7676
CONFIG_KEXEC_FILE=y
7777
CONFIG_KPROBES_ON_FTRACE=y

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -124,25 +124,25 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=m
124124
CONFIG_CPU_FREQ_GOV_USERSPACE=m
125125
CONFIG_CPU_FREQ_STAT=y
126126
# CONFIG_CROSS_MEMORY_ATTACH is not set
127+
CONFIG_CRYPTO_AES=m
128+
CONFIG_CRYPTO_CTR=m
127129
CONFIG_CRYPTO_CTS=m
128130
CONFIG_CRYPTO_DES=m
129131
CONFIG_CRYPTO_FIPS=y
130132
CONFIG_CRYPTO_GCM=m
133+
CONFIG_CRYPTO_GCM=m
134+
CONFIG_CRYPTO_GHASH=m
131135
CONFIG_CRYPTO_HMAC=y
132-
CONFIG_CRYPTO_LIB_DES=m
133136
CONFIG_CRYPTO_LIB_AES=m
137+
CONFIG_CRYPTO_LIB_DES=m
134138
CONFIG_CRYPTO_LIB_GF128MUL=m
135139
CONFIG_CRYPTO_LZO=m
136140
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
141+
CONFIG_CRYPTO_NULL=m
142+
CONFIG_CRYPTO_NULL2=m
137143
CONFIG_CRYPTO_SHA1=y
138144
CONFIG_CRYPTO_USER_API_HASH=m
139145
CONFIG_CRYPTO_USER_API_SKCIPHER=m
140-
CONFIG_CRYPTO_NULL=m
141-
CONFIG_CRYPTO_NULL2=m
142-
CONFIG_CRYPTO_AES=m
143-
CONFIG_CRYPTO_CTR=m
144-
CONFIG_CRYPTO_GCM=m
145-
CONFIG_CRYPTO_GHASH=m
146146
CONFIG_CUSE=m
147147
CONFIG_DCB=y
148148
CONFIG_DEBUG_FS=y
@@ -171,6 +171,7 @@ CONFIG_DM_ZERO=m
171171
CONFIG_DNS_RESOLVER=y
172172
CONFIG_DRM=m
173173
CONFIG_DRM_VIRTIO_GPU=m
174+
CONFIG_DST_CACHE=y
174175
CONFIG_DUMMY=m
175176
CONFIG_DYNAMIC_DEBUG=y
176177
CONFIG_E100=m
@@ -219,8 +220,8 @@ CONFIG_GACT_PROB=y
219220
CONFIG_GENEVE=m
220221
CONFIG_GPIOLIB=y
221222
CONFIG_GPIO_SYSFS=y
223+
CONFIG_GRO_CELLS=y
222224
CONFIG_GTP=m
223-
CONFIG_MACSEC=m
224225
CONFIG_HARDENED_USERCOPY=y
225226
CONFIG_HIDRAW=y
226227
CONFIG_HID_A4TECH=m
@@ -417,9 +418,9 @@ CONFIG_ISCSI_TARGET=m
417418
CONFIG_ISCSI_TCP=m
418419
CONFIG_ISO9660_FS=m
419420
CONFIG_IXGBE=m
420-
CONFIG_IXGBE_IPSEC=y
421-
CONFIG_IXGBEVF_IPSEC=y
422421
CONFIG_IXGBEVF=m
422+
CONFIG_IXGBEVF_IPSEC=y
423+
CONFIG_IXGBE_IPSEC=y
423424
CONFIG_JME=m
424425
CONFIG_JOLIET=y
425426
CONFIG_JUMP_LABEL=y
@@ -442,13 +443,9 @@ CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
442443
CONFIG_LOG_BUF_SHIFT=18
443444
CONFIG_LOOPBACK_TARGET=m
444445
CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
445-
CONFIG_PSAMPLE=m
446-
CONFIG_NET_IFE=m
447446
CONFIG_LWTUNNEL=y
448447
CONFIG_LWTUNNEL_BPF=y
449-
CONFIG_DST_CACHE=y
450-
CONFIG_GRO_CELLS=y
451-
CONFIG_SOCK_VALIDATE_XMIT=y
448+
CONFIG_MACSEC=m
452449
CONFIG_MACVLAN=m
453450
CONFIG_MACVTAP=m
454451
CONFIG_MAGIC_SYSRQ=y
@@ -468,24 +465,27 @@ CONFIG_MINIX_SUBPARTITION=y
468465
# CONFIG_MLX4_DEBUG is not set
469466
CONFIG_MLX4_EN=m
470467
CONFIG_MLX4_INFINIBAND=m
468+
CONFIG_MLX5_BRIDGE=y
469+
CONFIG_MLX5_CLS_ACT=y
471470
CONFIG_MLX5_CORE=m
472471
CONFIG_MLX5_CORE_EN=y
472+
CONFIG_MLX5_CORE_EN_DCB=y
473473
CONFIG_MLX5_EN_ARFS=y
474+
CONFIG_MLX5_EN_IPSEC=y
474475
CONFIG_MLX5_EN_RXNFC=y
475-
CONFIG_MLX5_MPFS=y
476+
CONFIG_MLX5_EN_TLS=y
476477
CONFIG_MLX5_ESWITCH=y
477-
CONFIG_MLX5_BRIDGE=y
478-
CONFIG_MLX5_CLS_ACT=y
479-
CONFIG_MLX5_TC_CT=y
480-
CONFIG_MLX5_TC_SAMPLE=y
481-
CONFIG_MLX5_CORE_EN_DCB=y
478+
CONFIG_MLX5_INFINIBAND=m
482479
CONFIG_MLX5_MACSEC=y
483-
CONFIG_MLX5_EN_IPSEC=y
484-
CONFIG_MLX5_EN_TLS=y
485-
CONFIG_MLX5_SW_STEERING=y
480+
CONFIG_MLX5_MPFS=y
486481
CONFIG_MLX5_SF=y
487482
CONFIG_MLX5_SF_MANAGER=y
488-
CONFIG_MLX5_INFINIBAND=m
483+
CONFIG_MLX5_SW_STEERING=y
484+
CONFIG_MLX5_TC_CT=y
485+
CONFIG_MLX5_TC_SAMPLE=y
486+
CONFIG_MLX5_VDPA=y
487+
CONFIG_MLX5_VDPA_NET=m
488+
CONFIG_MLX5_VFIO_PCI=m
489489
CONFIG_MMC=m
490490
CONFIG_MMC_BLOCK=m
491491
CONFIG_MMC_BLOCK_MINORS=16
@@ -589,34 +589,33 @@ CONFIG_NET_9P=m
589589
# CONFIG_NET_9P_DEBUG is not set
590590
CONFIG_NET_9P_RDMA=m
591591
CONFIG_NET_9P_VIRTIO=m
592+
CONFIG_NET_ACT_BPF=m
593+
CONFIG_NET_ACT_CONNMARK=m
592594
CONFIG_NET_ACT_CSUM=m
593-
CONFIG_NET_ACT_MPLS=m
595+
CONFIG_NET_ACT_CT=m
596+
CONFIG_NET_ACT_CTINFO=m
594597
CONFIG_NET_ACT_GACT=m
598+
CONFIG_NET_ACT_GATE=m
599+
CONFIG_NET_ACT_IFE=m
595600
CONFIG_NET_ACT_IPT=m
596601
CONFIG_NET_ACT_MIRRED=m
597-
CONFIG_NET_ACT_SAMPLE=m
602+
CONFIG_NET_ACT_MPLS=m
598603
CONFIG_NET_ACT_NAT=m
599604
CONFIG_NET_ACT_PEDIT=m
600-
CONFIG_NET_ACT_SIMP=m
601605
CONFIG_NET_ACT_POLICE=m
606+
CONFIG_NET_ACT_SAMPLE=m
607+
CONFIG_NET_ACT_SIMP=m
602608
CONFIG_NET_ACT_SKBEDIT=m
603-
CONFIG_NET_ACT_VLAN=m
604-
CONFIG_NET_ACT_BPF=m
605-
CONFIG_NET_ACT_CONNMARK=m
606-
CONFIG_NET_ACT_CTINFO=m
607609
CONFIG_NET_ACT_SKBMOD=m
608-
CONFIG_NET_ACT_IFE=m
609610
CONFIG_NET_ACT_TUNNEL_KEY=m
610-
CONFIG_NET_ACT_CT=m
611-
CONFIG_NET_ACT_GATE=m
612-
CONFIG_NET_TC_SKB_EXT=y
611+
CONFIG_NET_ACT_VLAN=m
613612
# CONFIG_NET_CADENCE is not set
614613
CONFIG_NET_CLS_ACT=y
615614
CONFIG_NET_CLS_BASIC=m
616615
CONFIG_NET_CLS_BPF=m
617-
CONFIG_NET_CLS_FLOWER=m
618616
CONFIG_NET_CLS_CGROUP=m
619617
CONFIG_NET_CLS_FLOW=m
618+
CONFIG_NET_CLS_FLOWER=m
620619
CONFIG_NET_CLS_FW=m
621620
CONFIG_NET_CLS_ROUTE4=m
622621
CONFIG_NET_CLS_U32=m
@@ -628,6 +627,7 @@ CONFIG_NET_EMATCH_NBYTE=m
628627
CONFIG_NET_EMATCH_TEXT=m
629628
CONFIG_NET_EMATCH_U32=m
630629
CONFIG_NET_FOU_IP_TUNNELS=y
630+
CONFIG_NET_IFE=m
631631
CONFIG_NET_IPGRE=m
632632
CONFIG_NET_IPGRE_BROADCAST=y
633633
CONFIG_NET_IPGRE_DEMUX=m
@@ -659,6 +659,7 @@ CONFIG_NET_SCH_SFB=m
659659
CONFIG_NET_SCH_SFQ=m
660660
CONFIG_NET_SCH_TBF=m
661661
CONFIG_NET_SCH_TEQL=m
662+
CONFIG_NET_TC_SKB_EXT=y
662663
CONFIG_NET_TULIP=y
663664
# CONFIG_NET_VENDOR_3COM is not set
664665
# CONFIG_NET_VENDOR_ADAPTEC is not set
@@ -697,29 +698,28 @@ CONFIG_NFT_BRIDGE_META=m
697698
CONFIG_NFT_BRIDGE_REJECT=m
698699
CONFIG_NFT_COMPAT=m
699700
CONFIG_NFT_CT=m
700-
CONFIG_NFT_FLOW_OFFLOAD=m
701701
CONFIG_NFT_DUP_IPV4=m
702702
CONFIG_NFT_DUP_IPV6=m
703703
CONFIG_NFT_DUP_NETDEV=m
704704
CONFIG_NFT_FIB=m
705705
CONFIG_NFT_FIB_INET=m
706-
CONFIG_NFT_XFRM=m
707706
CONFIG_NFT_FIB_IPV4=m
708707
CONFIG_NFT_FIB_IPV6=m
709708
CONFIG_NFT_FIB_NETDEV=m
709+
CONFIG_NFT_FLOW_OFFLOAD=m
710710
CONFIG_NFT_FWD_NETDEV=m
711-
CONFIG_NF_FLOW_TABLE=m
712711
CONFIG_NFT_HASH=m
713712
CONFIG_NFT_LIMIT=m
714713
CONFIG_NFT_LOG=m
715714
CONFIG_NFT_MASQ=m
716715
CONFIG_NFT_NAT=m
717-
CONFIG_NFT_TUNNEL=m
718716
CONFIG_NFT_NUMGEN=m
719717
CONFIG_NFT_QUEUE=m
720718
CONFIG_NFT_QUOTA=m
721719
CONFIG_NFT_REDIR=m
722720
CONFIG_NFT_REJECT=m
721+
CONFIG_NFT_TUNNEL=m
722+
CONFIG_NFT_XFRM=m
723723
CONFIG_NF_CONNTRACK=m
724724
CONFIG_NF_CONNTRACK_AMANDA=m
725725
CONFIG_NF_CONNTRACK_BRIDGE=m
@@ -742,6 +742,7 @@ CONFIG_NF_CT_NETLINK=m
742742
CONFIG_NF_CT_NETLINK_HELPER=m
743743
CONFIG_NF_CT_NETLINK_TIMEOUT=m
744744
CONFIG_NF_CT_PROTO_UDPLITE=y
745+
CONFIG_NF_FLOW_TABLE=m
745746
CONFIG_NF_LOG_ARP=m
746747
CONFIG_NF_SOCKET_IPV4=m
747748
CONFIG_NF_SOCKET_IPV6=m
@@ -803,6 +804,7 @@ CONFIG_PRINTK_TIME=y
803804
# CONFIG_PRINT_QUOTA_WARNING is not set
804805
CONFIG_PROC_KCORE=y
805806
CONFIG_PROFILING=y
807+
CONFIG_PSAMPLE=m
806808
CONFIG_PSI=y
807809
# CONFIG_PSI_DEFAULT_DISABLED is not set
808810
CONFIG_PTP_1588_CLOCK=m
@@ -900,6 +902,7 @@ CONFIG_SKY2=m
900902
CONFIG_SLAB_FREELIST_HARDENED=y
901903
CONFIG_SLAB_FREELIST_RANDOM=y
902904
CONFIG_SMP=y
905+
CONFIG_SOCK_VALIDATE_XMIT=y
903906
CONFIG_SOFTLOCKUP_DETECTOR=y
904907
CONFIG_SOFT_WATCHDOG=m
905908
CONFIG_SOLARIS_X86_PARTITION=y
@@ -942,8 +945,6 @@ CONFIG_TIGON3=m
942945
CONFIG_TLS=m
943946
CONFIG_TLS_DEVICE=y
944947
CONFIG_TLS_TOE=y
945-
CONFIG_XFRM=yes
946-
CONFIG_XFRM_OFFLOAD=y
947948
CONFIG_TMPFS=y
948949
CONFIG_TMPFS_POSIX_ACL=y
949950
CONFIG_TRANSPARENT_HUGEPAGE=y
@@ -977,18 +978,18 @@ CONFIG_USB_UHCI_HCD=m
977978
CONFIG_USB_USBNET=m
978979
CONFIG_USB_XHCI_HCD=m
979980
CONFIG_USER_NS=y
981+
CONFIG_VDPA=m
980982
CONFIG_VETH=m
981983
CONFIG_VFAT_FS=m
982984
CONFIG_VFIO=m
983985
CONFIG_VFIO_PCI=m
984-
CONFIG_VHOST_NET=m
985986
CONFIG_VFIO_PCI_CORE=m
986-
CONFIG_VFIO_PCI_MMAP=y
987+
CONFIG_VFIO_PCI_IGD=y
987988
CONFIG_VFIO_PCI_INTX=y
989+
CONFIG_VFIO_PCI_MMAP=y
988990
CONFIG_VFIO_PCI_VGA=y
989-
CONFIG_VFIO_PCI_IGD=y
990-
CONFIG_MLX5_VFIO_PCI=m
991991
CONFIG_VHOST_IOTLB=m
992+
CONFIG_VHOST_NET=m
992993
CONFIG_VHOST_RING=m
993994
CONFIG_VIA_RHINE=m
994995
CONFIG_VIA_RHINE_MMIO=y
@@ -1002,9 +1003,6 @@ CONFIG_VIRTIO_NET=m
10021003
CONFIG_VIRTIO_PCI=y
10031004
CONFIG_VIRTIO_VSOCKETS=m
10041005
CONFIG_VIRT_DRIVERS=y
1005-
CONFIG_VDPA=m
1006-
CONFIG_MLX5_VDPA=y
1007-
CONFIG_MLX5_VDPA_NET=m
10081006
CONFIG_VLAN_8021Q=m
10091007
CONFIG_VLAN_8021Q_GVRP=y
10101008
CONFIG_VLAN_8021Q_MVRP=y
@@ -1024,7 +1022,9 @@ CONFIG_XEN_NETDEV_BACKEND=m
10241022
CONFIG_XEN_NETDEV_FRONTEND=m
10251023
CONFIG_XEN_SCSI_FRONTEND=m
10261024
CONFIG_XEN_WDT=m
1025+
CONFIG_XFRM=y
10271026
CONFIG_XFRM_MIGRATE=y
1027+
CONFIG_XFRM_OFFLOAD=y
10281028
CONFIG_XFRM_STATISTICS=y
10291029
CONFIG_XFRM_SUB_POLICY=y
10301030
CONFIG_XFRM_USER=m

0 commit comments

Comments
 (0)