diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-02-23 16:39:23 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-02-23 16:39:23 +0100 |
| commit | ba4da878448507f877ad73612cbc43be102c2b55 (patch) | |
| tree | 0602d1e4c1e03550ab2121b0b37fa5ab9817a05f /kernel-s390x-zfcpdump-rhel.config | |
| parent | f39bbe54feebf65d17e9cfde0fff0be9e31932ac (diff) | |
| parent | 1d814e580d73048c3ec93b177e4a93593bcdc6b8 (diff) | |
| download | kernel-ba4da878448507f877ad73612cbc43be102c2b55.tar.gz kernel-ba4da878448507f877ad73612cbc43be102c2b55.tar.xz kernel-ba4da878448507f877ad73612cbc43be102c2b55.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc5.20220223git5c1ee569660d.104.vanilla.1.fc37kernel-5.17.0-0.rc5.20220223git5c1ee569660d.104.vanilla.1.fc36kernel-5.17.0-0.rc5.20220223git5c1ee569660d.104.vanilla.1.fc35kernel-5.17.0-0.rc5.20220223git5c1ee569660d.104.vanilla.1.fc34
Diffstat (limited to 'kernel-s390x-zfcpdump-rhel.config')
| -rw-r--r-- | kernel-s390x-zfcpdump-rhel.config | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 271460d0b..56d3156c4 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3094,10 +3094,9 @@ CONFIG_MOUSE_SYNAPTICS_USB=m # CONFIG_MPL115_I2C is not set # CONFIG_MPL115_SPI is not set # CONFIG_MPL3115 is not set -# CONFIG_MPLS_GSO is not set -# CONFIG_MPLS_IPTUNNEL is not set -# CONFIG_MPLS_ROUTING is not set -CONFIG_MPLS=y +CONFIG_MPLS_IPTUNNEL=m +# CONFIG_MPLS is not set +CONFIG_MPLS_ROUTING=m CONFIG_MPTCP_IPV6=y CONFIG_MPTCP_KUNIT_TEST=m CONFIG_MPTCP=y |