From: David S. Miller Date: Thu, 3 Jul 2014 00:11:00 +0000 (-0700) Subject: Merge branch 'qlcnic-next' X-Git-Tag: firefly_0821_release~176^2~3474^2~237 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=af7efaff2602ec3bb4c5e601204cecabea25744d;p=firefly-linux-kernel-4.4.55.git Merge branch 'qlcnic-next' Harish Patil says: ==================== qlcnic: Enhance Tx timeout debug data collection. The following set of patches are for enhancing Tx timeout debug collection - Collect a firmware dump on first Tx timeout if netif_msg_tx_err() is set - Log Receive and Status ring info on Tx timeout, in addition to Tx ring info - Log additional Tx ring info if netif_msg_tx_err() is set - Update driver version to 5.3.61 Please apply this series to net-next. ==================== Signed-off-by: David S. Miller --- af7efaff2602ec3bb4c5e601204cecabea25744d