From: David S. Miller Date: Fri, 24 Jan 2014 00:13:39 +0000 (-0800) Subject: Merge branch 'qlcnic' X-Git-Tag: firefly_0821_release~176^2~4570^2~6 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9fac865db04b4ee39c84fbcb461c38585acaff27;p=firefly-linux-kernel-4.4.55.git Merge branch 'qlcnic' Himanshu Madhani says: ==================== qlcnic: Refactoring and enhancements for all adapters. This patch series contains following patches. o Enhanced debug data collection when we are in Tx-timeout situation. o Enhanced MSI-x vector calculation for defualt load path as well as for TSS/RSS ring change path. o Refactored interrupt coalescing code for all adapters. o Refactored interrupt handling as well as cleanup of poll controller code patch for all adapters. o changed rx_mac_learn type to boolean. Please apply to net-next. ==================== Signed-off-by: Zoltan Kiss Signed-off-by: David S. Miller --- 9fac865db04b4ee39c84fbcb461c38585acaff27