From: David S. Miller Date: Tue, 30 Sep 2014 20:22:51 +0000 (-0400) Subject: Merge branch 'netxen' X-Git-Tag: v3.17~14^2~5 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=37b9a2673cd24e389216770be24a064b6200a822;p=~emulex%2Finfiniband.git Merge branch 'netxen' Manish Chopra says: ==================== netxen: Bug fixes. This series fixes some TX specific issues. * Move spin_lock(tx_clean_lock) in down path to fix atomic sleep bug (Reported by Mike Galbraith). * Fix hang in interface down while running traffic. Please consider applying this to 'net'. ==================== Signed-off-by: David S. Miller --- 37b9a2673cd24e389216770be24a064b6200a822