From: David S. Miller Date: Fri, 9 May 2014 17:13:44 +0000 (-0400) Subject: Merge branch 'be2net-next' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=97e72829d7c0efc9fe7768148ef490bc83ebce0e;p=linux-beck.git Merge branch 'be2net-next' Sathya Perla says: ==================== be2net: patch set This patch set contains the following modificatons: * three patches (1/7 to 3/7) that fix indentation style issues * convert the u8 vlan[] array to a bit-map to reduce memory usage * use MCCQ instead of MBOX in be_cmd_rss_config() as the MCCQ is already created by that time * include rx-comp-error counter in ethtool stats * remove the unused promiscuous setting from be_cmd_vlan_config() Pls apply to net-next tree. Thanks! ==================== Signed-off-by: David S. Miller --- 97e72829d7c0efc9fe7768148ef490bc83ebce0e