summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-zfcpdump-rhel.config
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-05-13 16:19:02 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-05-13 16:19:02 -0500
commite12344cfaccaeaf576e5ea8e49e1e8d9152716b0 (patch)
tree54cbc17a8e4c9feb11e158557eeca009ea3182b5 /kernel-s390x-zfcpdump-rhel.config
parentd97369011793cc522b6687b476e84e06adebb66e (diff)
downloadkernel-e12344cfaccaeaf576e5ea8e49e1e8d9152716b0.tar.gz
kernel-e12344cfaccaeaf576e5ea8e49e1e8d9152716b0.tar.xz
kernel-e12344cfaccaeaf576e5ea8e49e1e8d9152716b0.zip
kernel-5.13.0-0.rc1.20210513gitc06a2ba62fc4.15
* Thu May 13 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc1.20210513gitc06a2ba62fc4.15] - Remove unused boot loader specification files (David Ward) - Revert "nvme: multipath: Change default of kernel NVMe multipath to be disabled" (Mike Snitzer) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'kernel-s390x-zfcpdump-rhel.config')
-rw-r--r--kernel-s390x-zfcpdump-rhel.config4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 9e4ae47ef..8dcc37cfa 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -2967,7 +2967,7 @@ CONFIG_MICROCHIP_PHY=m
CONFIG_MICROCHIP_T1_PHY=m
# CONFIG_MICROCODE_OLD_INTERFACE is not set
CONFIG_MICROSEMI_PHY=m
-# CONFIG_MICROSOFT_MANA is not set
+CONFIG_MICROSOFT_MANA=m
CONFIG_MIGRATION=y
# CONFIG_MII is not set
# CONFIG_MINIX_FS is not set
@@ -3280,7 +3280,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
CONFIG_NETFILTER_NETLINK=m
CONFIG_NETFILTER_NETLINK_OSF=m
CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_XTABLES_COMPAT=y
+# CONFIG_NETFILTER_XTABLES_COMPAT is not set
CONFIG_NETFILTER_XTABLES=y
CONFIG_NETFILTER_XT_CONNMARK=m
CONFIG_NETFILTER_XT_MARK=m