projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 87566b4 1515aa7)
Merge branch 'ip6_tunnel-add-MPLS-support'
authorDavid S. Miller <davem@davemloft.net>
Fri, 22 May 2020 22:49:31 +0000 (15:49 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 22 May 2020 22:49:31 +0000 (15:49 -0700)
commitdf0651f8c0cc29603598f1de99426fd862365fc2
treeba8239f128711161333a10701f5b162642d14311tree | snapshot
parent87566b446b77fdd20a36832511a70ffe3227091ecommit | diff
parent1515aa70c04151676a7dfefecfcf1d36ff52bc67commit | diff
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>
MicroBlaze GIT Repository