On Mon, May 25, 2020 at 05:49:51PM -0700, David Miller wrote: > From: David Miller <da...@davemloft.net> > Date: Mon, 25 May 2020 17:38:18 -0700 (PDT) > > > Series applied, thanks. > > Reverted, this doesn't even build with the one of the most popular drivers > in the tree, mlx5. > Well, this comes from the latest mlx5 pull request, which was posted _after_ this patch set.
> drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_mplsoudp.c: In function > ‘parse_tunnel’: > drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_mplsoudp.c:105:52: error: > ‘struct flow_dissector_key_mpls’ has no member named ‘mpls_label’ > 105 | outer_first_mpls_over_udp.mpls_label, match.mask->mpls_label); > | ^~ > ./include/linux/mlx5/device.h:74:11: note: in definition of macro ‘MLX5_SET’ > 74 | u32 _v = v; \ > | ^ > drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_mplsoudp.c:107:51: error: > ‘struct flow_dissector_key_mpls’ has no member named ‘mpls_label’ > 107 | outer_first_mpls_over_udp.mpls_label, match.key->mpls_label); > | ^~ > ./include/linux/mlx5/device.h:74:11: note: in definition of macro ‘MLX5_SET’ > 74 | u32 _v = v; \ > | ^ Anyway, I'll respin.