diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-02-04 16:17:51 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-04 16:17:51 -0800 |
| commit | 9ba11ac04ee89fc624abc73cbe7a8a62ddbbba06 (patch) | |
| tree | 1bc80ae48985c94472d26ec6a1d7e346ee16b2a8 /drivers/net/ethernet/ibm/emac/core.c | |
| parent | Merge branch 'mlx4-next' (diff) | |
| parent | net/mlx4_en: Notify TX Vlan offload change (diff) | |
| download | linux-dev-9ba11ac04ee89fc624abc73cbe7a8a62ddbbba06.tar.xz linux-dev-9ba11ac04ee89fc624abc73cbe7a8a62ddbbba06.zip | |
Merge branch 'mlx4-next'
Amir Vadai says:
====================
Mellanox drivers updates Feb-03-2015
This patchset introduces some small bug fixes and code cleanups in mlx4_core,
mlx4_en and mlx5_core.
I am sending it in parallel to the patchset sent by Or Gerlitz today [1] because
this is the end of the time frame for 3.20. I also checked that there are no
conflicts between those two patchsets (Or's patchset is focused on the bonding
area while this on Mellanox drivers).
The patchset was applied on top of commit 7d37d0c ('net: sctp: Deletion of an
unnecessary check before the function call "kfree"')
[1] - [PATCH 00/10] Add HA and LAG support to mlx4 RoCE and SRIOV services
http://marc.info/?l=linux-netdev&m=142297582610254&w=2
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions