aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/scripts/python
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2020-05-22 15:49:31 -0700
committerDavid S. Miller <davem@davemloft.net>2020-05-22 15:49:31 -0700
commitdf0651f8c0cc29603598f1de99426fd862365fc2 (patch)
treeba8239f128711161333a10701f5b162642d14311 /tools/perf/scripts/python
parentMerge branch 'mediatek-add-support-for-MediaTek-Ethernet-MAC' (diff)
parentmpls: Add support for IPv6 tunnels (diff)
downloadlinux-df0651f8c0cc29603598f1de99426fd862365fc2.tar.gz
linux-df0651f8c0cc29603598f1de99426fd862365fc2.zip
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>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions