From: David S. Miller Date: Wed, 9 Dec 2015 03:43:15 +0000 (-0500) Subject: Merge branch 'cxgb4-update-kconfig-and-fixes' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bc22ff5363b1842b0507c4eefefde7748dbc7032;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'cxgb4-update-kconfig-and-fixes' Hariprasad Shenai says: ==================== Update Kconfig and some fixes for cxgb4 This series update Kconfig to add description for Chelsio's next generation T6 family of adapters, also fixes ethtool stats alignment and prevents simultaneous execution of service_ofldq thread, deals with queue wrap around and adds some fl counters for debugging purpose and device ID for new T5 adapters. This patch series has been created against net-next tree and includes patches on cxgb4 driver. We have included all the maintainers of respective drivers. Kindly review the change and let us know in case of any review comments. Thanks V2: Declare 'service_ofldq_running' as bool in Patch 4/7 ("cxgb4: prevent simultaneous execution of service_ofldq()") based on review comment by David Miller ==================== Signed-off-by: David S. Miller --- bc22ff5363b1842b0507c4eefefde7748dbc7032