From: Guillaume Nault <gnault(a)redhat.com&gt; redhat: configs: Disable CONFIG_MPLS for s390x/zfcpdump Instead of disabling all MPLS sub-options one by one for s390x/zfcpdump, let's just disable MPLS entirely. This also removes an inconsistency we had in redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_NET_MPLS_GSO, which had a typo (CONFIG_MPLS_GSO instead of CONFIG_NET_MPLS_GSO). Signed-off-by: Guillaume Nault <gnault(a)redhat.com&gt; diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_MPLS b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_MPLS new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_MPLS @@ -0,0 +1 @@ +# CONFIG_MPLS is not set diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_MPLS_IPTUNNEL b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_MPLS_IPTUNNEL deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_MPLS_IPTUNNEL +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MPLS_IPTUNNEL is not set diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_MPLS_ROUTING b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_MPLS_ROUTING deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_MPLS_ROUTING +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MPLS_ROUTING is not set diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_NET_MPLS_GSO b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_NET_MPLS_GSO deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_NET_MPLS_GSO +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_MPLS_GSO is not set -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1606