diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-05-09 00:21:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-09 00:21:13 -0400 |
| commit | 8846a125de97f96be64ca234906eedfd26ad778e (patch) | |
| tree | 8b8a9889a70a14ca07852753e5e60995a7ab483b /tools/perf/scripts/python/stackcollapse.py | |
| parent | macsec: key identifier is 128 bits, not 64 (diff) | |
| parent | net/mlx5e: make VXLAN support conditional (diff) | |
| download | wireguard-linux-8846a125de97f96be64ca234906eedfd26ad778e.tar.xz wireguard-linux-8846a125de97f96be64ca234906eedfd26ad778e.zip | |
Merge branch 'mlx5-build-fix'
Saeed Mahameed says:
====================
net/mlx5e: Kconfig fixes for VxLAN
Reposting to net the build errors fixes posted by Arnd last week.
Originally Arnd posted those fixes to net-next, while the issue
is also seen in net. For net-next a different approach is required
for fixing the issue as VXLAN and Device Drivers are no longer
dependent, but there is no harm for those fixes to get into net-next.
Optionally, once net is merged into net-next we can
Revert "net/mlx5e: make VXLAN support conditional" as the
CONFIG_MLX5_CORE_EN_VXLAN will no longer be required.
Applied on top: 288928658583 ('mlxsw: spectrum: Add missing rollback in flood configuration')
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/scripts/python/stackcollapse.py')
0 files changed, 0 insertions, 0 deletions