From: David S. Miller <davem@davemloft.net>
Date: Wed, 23 Jul 2014 02:53:55 +0000 (-0700)
Subject: Merge branch 'mlx4-next'
X-Git-Tag: v3.17-rc1~106^2~103
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2dbe82d0d11836279703dcf2679e711e18c23eec;p=linux.git

Merge branch 'mlx4-next'

Amir Vadai says:

====================
Mellanox driver update Jul-22-2014

This patchset contains a fix by Eyal to fix a bug in mlx4_en with bonding
alb/tlb mode.
The second patch, by me, is an ethtool private flag that enable turning off the
BlueFlame hardware feature.
The last two patches, introduce a new low memory profile for mlx4_en and
mlx4_core. This mode is useful when running from a limited resources
environment, like kdump. This will reduce the memory consumed by both drivers
from more than 100M to ~30M.

This patchset was applied and tested on commit 575a193 ("net: mvpp2: Fix error
return code in mvpp2_probe")
====================

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

2dbe82d0d11836279703dcf2679e711e18c23eec