> It seems most appropriate to get an Acked-by from you, and merge > through me tree, IMO. While it clearly has IB impact, most of the > changes are in the lower-level mlx4_en driver.
Actually most of the changes are in mlx4_core, which is the common HW driver that both mlx4_en and mlx4_ib use, and which I've been maintaining up till now: > drivers/infiniband/hw/mlx4/cq.c | 2 +- > drivers/infiniband/hw/mlx4/main.c | 2 +- > drivers/net/mlx4/cq.c | 14 ++++++++-- > drivers/net/mlx4/en_cq.c | 9 ++++-- > drivers/net/mlx4/en_main.c | 4 +- > drivers/net/mlx4/eq.c | 47 > ++++++++++++++++++++++++------------ > drivers/net/mlx4/main.c | 14 ++++++---- > drivers/net/mlx4/mlx4.h | 4 +- > include/linux/mlx4/device.h | 4 ++- Not that it's a huge change anywhere, but only the mlx4_en changes are in en_cq.c and en_main.c, ie 13 out of 100 changed lines. In general I think I have a bigger chance of merging more mlx4_core stuff through my tree, so it will probably be smoother in terms of conflicts etc. if I carry this patch. - R. _______________________________________________ general mailing list [email protected] http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
