From: David S. Miller Date: Fri, 18 Oct 2013 17:42:30 +0000 (-0400) Subject: Merge branch 'qlcnic' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5d6fa0992ad46163111c651052a4e00e0f4a95bf;p=linux-beck.git Merge branch 'qlcnic' Himanshu Madhani says: ==================== qlcnic: ethtool enhancements and code cleanup. This patch series contains o updates to ethtool for pause settings and enhance register dump to display mask and ring indices. o cleanup in DCB code and remove redundant eSwitch enablement command. o fixed firmware dump collection logic to skip unknown entries. Changes from v3 -> v4 o Dropped patch for Tx queue validation to be submitted in net. Changes from v2 -> v3 o Updated patch to print informational messages as per Joe Perches's comment. Changes from v1 -> v2 o Dropped patch to register device if adapter is in FAILED state for more rework. o Updated patch to display ring indices via ethtool per Ben Hutchings's comment. o Update patch for DCB cleanup per Stephen Hemminger's comment. Please apply to net-next. ==================== Signed-off-by: David S. Miller --- 5d6fa0992ad46163111c651052a4e00e0f4a95bf