From: David S. Miller Date: Tue, 22 Jul 2014 03:24:32 +0000 (-0700) Subject: Merge branch 'cxgb4-next' X-Git-Tag: v3.17-rc1~106^2~112 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1bb4238b17b5de6cdc120970a9d00dd8a44f40df;p=linux.git Merge branch 'cxgb4-next' Hariprasad Shenai says: ==================== Misc. fix for cxgb4 and iw_cxgb4 This patch series adds support to enchance error reporting, log detailed warning for negative advice, support query_qp verb and advertise correct device max attributes for iwarp. The patches series is created against 'net-next' tree. And includes patches on cxgb4 and iw_cxgb4 driver. Since this patch-series contains changes which are dependent on commit id 4c2c5763 ("cxgb4/iw_cxgb4: use firmware ord/ird resource limits") of net-next tree we would like to request this patch series to get merged via David Miller's 'net-next' tree. ==================== Signed-off-by: David S. Miller --- 1bb4238b17b5de6cdc120970a9d00dd8a44f40df