tree 4c9eac68dca177a0335932c9b8191ffde55b7941
parent ecea49914b329e3f5cf746979c10e05e6bdad77a
parent e577516b9db3e0f19df82b6430fe3b06e05d6304
author David S. Miller <davem@davemloft.net> 1439186050 -0700
committer David S. Miller <davem@davemloft.net> 1439186071 -0700

Merge branch 'mlxsw-fixes'

Jiri Pirko says:

====================
mlxsw: Couple of fixes/adjustments

Ido Schimmel (5):
  mlxsw: Call free_netdev when removing port
  mlxsw: Make system port to local port mapping explicit
  mlxsw: Simplify mlxsw_sx_port_xmit function
  mlxsw: Use correct skb length when dumping payload
  mlxsw: Fix use-after-free bug in mlxsw_sx_port_xmit

Jiri Pirko (2):
  mlxsw: Make pci module dependent on HAS_DMA and HAS_IOMEM
  mlxsw: Strip FCS from incoming packets
====================

Signed-off-by: David S. Miller <davem@davemloft.net>