commit 0baab660dea3417c6e20d3aa99769e21f93b53cd Merge: 53cddbf b56ea15 Author: Vladimir Sokolovsky Date: Thu Feb 3 10:16:26 2011 +0200 Merge branch 'ofed_1_5' of git://git.openfabrics.org/~swise/ofed_kernel into ofed_kernel_1_5 commit b56ea1597bcc9baf0f538a974aa6c50ca72e83a4 Author: Steve Wise Date: Wed Feb 2 16:01:55 2011 -0600 cxgb3: 2.6.35 backports. Signed-off-by: Steve Wise commit 53cddbfdbaee57ed68006e61de9255bf9bcc9317 Author: Vladimir Sokolovsky Date: Wed Feb 2 15:36:37 2011 +0200 Fix backports for 2.6.3[4-6] Signed-off-by: Vladimir Sokolovsky commit 33128acf1abd0b1fdcb27eb579a38f73b125fa28 Author: Vladimir Sokolovsky Date: Wed Feb 2 14:49:20 2011 +0200 mlx4_en: Fix backport patches Signed-off-by: Vladimir Sokolovsky commit db2d245e415835d76597a117b037a18f1874a94d Author: Nir Muchtar Date: Thu Jan 20 15:45:35 2011 +0200 mlx4_en: Add an ability to attach to QPs to GIDS by priority. The basic flow: Upon receiving a high priority attach request, Make sure that it is put before all other low priority entries in the same MGM hash bucket. if a low priority entry already exists for the given GID, we'll have two entries with the same GID, which means that the low priority entry will be ignored. Signed-off-by: Nir Muchtar commit 2c15c3894d7152e9ef132d4e68e8aafd8deac110 Author: Vladimir Sokolovsky Date: Thu Dec 2 14:33:21 2010 +0200 mlx4_en: fix backport patches for kernels <= 2.6.28 Signed-off-by: Vladimir Sokolovsky commit 1f20b8ea336e016b31ce3170b6fd32b693d3e3e3 Author: Vladimir Sokolovsky Date: Wed Dec 1 11:51:31 2010 +0200 mlx4_ib: Set port number in the multicast gid Signed-off-by: Vladimir Sokolovsky commit 8a3f3887205c3a5aae4bc6bbdb617862d42fa1ef Author: Vladimir Sokolovsky Date: Wed Dec 1 11:50:42 2010 +0200 mlx4_en: new steering model Signed-off-by: Vladimir Sokolovsky commit 21beaae06cea6cb10a3e8c626089b53d8ee6d5f6 Author: Steve Wise Date: Mon Jan 31 12:32:34 2011 -0600 cxgb3: 2.6.36 backports. Signed-off-by: Steve Wise commit 3caeec77957191a4528139ffe752badf205c3df0 Author: Maciej Sosnowski Date: Thu Jan 27 16:10:54 2011 +0100 RDMA/nes: fix hazard of sending ibevent for unregistered device nes_port_ibevent() should not be called when nes IB device is not registered with IB core. Add missing checks of of_device_registered flag. Signed-off-by: Maciej Sosnowski