From: David S. Miller Date: Thu, 22 Oct 2015 14:04:08 +0000 (-0700) Subject: Merge branch 'cxgb4-trivial-fixes' X-Git-Tag: MMI-PSA29.97-13-9~9125^2~87 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e9e6d79c521b91e7103fea37411680e31927487b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'cxgb4-trivial-fixes' Hariprasad Shenai says: ==================== Trivial fixes for cxgb4 driver This patch series updates driver description for next gen. adapters, updates firmware info., returns error for setup_rss error case, restores L1 configuration in case of FW rejects new config, updates and aligns ethtool get stats settings, etc This patch series has been created against net-next tree and includes patches on cxgb4 and cxgb4vf driver. We have included all the maintainers of respective drivers. Kindly review the change and let us know in case of any review comments. ==================== Signed-off-by: David S. Miller --- e9e6d79c521b91e7103fea37411680e31927487b