From: David S. Miller <davem@davemloft.net>
Date: Fri, 22 May 2020 22:49:31 +0000 (-0700)
Subject: Merge branch 'ip6_tunnel-add-MPLS-support'
X-Git-Tag: v5.8-rc1~165^2~136
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df0651f8c0cc29603598f1de99426fd862365fc2;p=thirdparty%2Flinux.git

Merge branch 'ip6_tunnel-add-MPLS-support'

Vadim Fedorenko says:

====================
ip6_tunnel: add MPLS support

The support for MPLS-in-IPv4 was added earlier. This patchset adds
support for MPLS-in-IPv6.

Changes in v2:
- Eliminate ifdefs IS_ENABLE(CONFIG_MPLS)
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

df0651f8c0cc29603598f1de99426fd862365fc2