On Thu, Aug 23, 2018 at 03:37:24AM +0200, Andre Tomt wrote:
On 10. aug. 2018 02:22, Sasha Levin wrote:
<snip> > Arnaldo Carvalho de Melo (1): > tools include uapi: Update if_link.h to pick IFLA_{BRPORT_ISOLATED,VXLAN_TTL_INHERIT}
This commit references two mainline commits: 7d850abd5f4e ("net: bridge: add support for port isolation") 72f6d71e491e ("vxlan: add ttl inherit support")
However they are first seen in 4.18-rc1, and thus makes the 4.17.x headers out of sync:
$ diff -u include/uapi/linux/if_link.h tools/include/uapi/linux/if_link.h --- include/uapi/linux/if_link.h 2018-06-03 23:15:21.000000000 +0200 +++ tools/include/uapi/linux/if_link.h 2018-08-23 03:27:56.185758005 +0200 @@ -333,6 +333,7 @@ IFLA_BRPORT_BCAST_FLOOD, IFLA_BRPORT_GROUP_FWD_MASK, IFLA_BRPORT_NEIGH_SUPPRESS,
- IFLA_BRPORT_ISOLATED, __IFLA_BRPORT_MAX
}; #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) @@ -516,6 +517,7 @@ IFLA_VXLAN_COLLECT_METADATA, IFLA_VXLAN_LABEL, IFLA_VXLAN_GPE,
- IFLA_VXLAN_TTL_INHERIT, __IFLA_VXLAN_MAX
}; #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)
it is queue-4.17/tools-include-uapi-update-if_link.h-to-pick-ifla_-brport_isolated-vxlan_ttl_inherit.patch in stable-queue.git
Good catch, I've dropped this patch now.
thanks,
greg k-h