Merge branch 'mlx4-fixes'
authorDavid S. Miller <davem@davemloft.net>
Wed, 22 Jun 2016 20:38:17 +0000 (16:38 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 22 Jun 2016 20:38:17 +0000 (16:38 -0400)
commitacd43fe85b2d1dbad55ce211b8817e6d6687246f
tree58119d9fbb3bfae0856da104657aad7d3dcf59f7
parent27777daa8b6df0c19aaf591d1536a586b3eb5e36
parent9d76931180557270796f9631e2c79b9c7bb3c9fb
Merge branch 'mlx4-fixes'

Tariq Toukan says:

====================
mlx4_en fixes for 4.7-rc

This small patchset includes two small fixes for mlx4_en driver.

One allows a clean shutdown even when clients do not release their
netdev reference.
The other adds error return values to the VLAN VID add/kill functions.
====================

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