Merge branch 'master-next' into python3

* master-next:
  nlpacket: add tunnel link_kind to encode support list
  addons.conf: remove duplicate entry for tunnel pre-up

etc/network/ifupdown2/addons.conf

@@ -12,7 +12,6 @@ pre-up,bridgevlan
 pre-up,mstpctl
 pre-up,tunnel
 pre-up,vrf
-pre-up,tunnel
 pre-up,ethtool
 pre-up,address
 up,dhcp

ifupdown2/nlmanager/nlpacket.py

@@ -2745,6 +2745,18 @@ class AttributeIFLA_LINKINFO(Attribute):
             "dummy",
             "bridge",
             "macvlan",
+            "gre",
+            "gretap",
+            "erspan",
+            "ip6gre",
+            "ip6gretap",
+            "ip6erspan",
+            "vti",
+            "vti6",
+            "ipip",
+            "sit",
+            "ip6tnl",
+
         ):
             self.log.debug('Unsupported IFLA_INFO_KIND %s' % kind)
             return