1. 11 5月, 2016 14 次提交
  2. 10 5月, 2016 25 次提交
  3. 09 5月, 2016 1 次提交
    • D
      Merge branch 'mlx5-build-fix' · 8846a125
      David S. Miller 提交于
      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: 28892865 ('mlxsw: spectrum: Add missing rollback in flood configuration')
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8846a125