From 9de60b93e3bf3e4cf5e3bd1f54f12379c697942b Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 4 Oct 2021 08:28:48 -0500 Subject: kernel-5.15-0.rc4.33 * Mon Oct 04 2021 Fedora Kernel Team [5.15-0.rc4.33] - Fix ordering in genspec args (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- kernel-x86_64-debug-rhel.config | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'kernel-x86_64-debug-rhel.config') diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index d7baf97b6..c65cc845c 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -507,8 +507,8 @@ CONFIG_BRIDGE_EBT_VLAN=m CONFIG_BRIDGE_IGMP_SNOOPING=y CONFIG_BRIDGE=m # CONFIG_BRIDGE_MRP is not set -CONFIG_BRIDGE_NETFILTER=m -CONFIG_BRIDGE_NF_EBTABLES=m +# CONFIG_BRIDGE_NETFILTER is not set +# CONFIG_BRIDGE_NF_EBTABLES is not set CONFIG_BRIDGE_VLAN_FILTERING=y CONFIG_BROADCOM_PHY=m CONFIG_BSD_DISKLABEL=y @@ -2085,9 +2085,9 @@ CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set CONFIG_HYPERV_BALLOON=m CONFIG_HYPERV_IOMMU=y -# CONFIG_HYPERV is not set CONFIG_HYPERVISOR_GUEST=y CONFIG_HYPERV_KEYBOARD=m +CONFIG_HYPERV=m CONFIG_HYPERV_NET=m CONFIG_HYPERV_STORAGE=m # CONFIG_HYPERV_TESTING is not set @@ -2487,7 +2487,7 @@ CONFIG_IOSF_MBI=y # CONFIG_IO_STRICT_DEVMEM is not set # CONFIG_IO_URING is not set CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_IPTABLES is not set CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -2526,9 +2526,9 @@ CONFIG_IP_MULTICAST=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m -CONFIG_IP_NF_ARPTABLES=m +# CONFIG_IP_NF_ARPTABLES is not set CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_IPTABLES=m +# CONFIG_IP_NF_IPTABLES is not set CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m @@ -2566,8 +2566,8 @@ CONFIG_IP_SET_HASH_NET=m CONFIG_IP_SET_HASH_NETNET=m CONFIG_IP_SET_HASH_NETPORT=m CONFIG_IP_SET_HASH_NETPORTNET=m +# CONFIG_IP_SET is not set CONFIG_IP_SET_LIST_SET=m -CONFIG_IP_SET=m CONFIG_IP_SET_MAX=256 CONFIG_IPV6_GRE=m # CONFIG_IPV6_ILA is not set @@ -3573,7 +3573,7 @@ CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_OSF=m CONFIG_NETFILTER_NETLINK_QUEUE=m # CONFIG_NETFILTER_XTABLES_COMPAT is not set -CONFIG_NETFILTER_XTABLES=y +# CONFIG_NETFILTER_XTABLES is not set CONFIG_NETFILTER_XT_CONNMARK=m CONFIG_NETFILTER_XT_MARK=m CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m @@ -3793,6 +3793,7 @@ CONFIG_NF_CONNTRACK_H323=m CONFIG_NF_CONNTRACK_IPV4=m CONFIG_NF_CONNTRACK_IPV6=m CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_LABELS=y CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_NETBIOS_NS=m @@ -3873,7 +3874,7 @@ CONFIG_NFT_BRIDGE_META=m CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NFT_CHAIN_NAT_IPV4=m CONFIG_NFT_CHAIN_NAT_IPV6=m -CONFIG_NFT_COMPAT=m +# CONFIG_NFT_COMPAT is not set CONFIG_NFT_CONNLIMIT=m CONFIG_NFT_COUNTER=m CONFIG_NFT_CT=m @@ -6120,7 +6121,7 @@ CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set CONFIG_THINKPAD_ACPI_VIDEO=y -# CONFIG_THINKPAD_LMI is not set +CONFIG_THINKPAD_LMI=m # CONFIG_THRUSTMASTER_FF is not set CONFIG_THUNDERX2_PMU=m # CONFIG_TI_ADC081C is not set -- cgit