Merge branches 'cma', 'cxgb3', 'ehca', 'ipoib', 'mad', 'mlx4' and 'nes' into for-next

2026-09-18 18:15:59 +00:00 · 2008-10-22 15:56:41 -07:00 · 2008-10-22 15:56:41 -07:00 · 56f2fdaade
commit 56f2fdaade
parent 6aea938f54 dc35fac9e9 263c24a2bb 83bb63f62b 528051746b 57893d1cff 7b49d9548e
43 changed files with 6392 additions and 123 deletions
--- a/4
+++ b/4
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
--- a/drivers/infiniband/hw/ehca/ehca_classes.h
+++ b/drivers/infiniband/hw/ehca/ehca_classes.h
--- a/drivers/infiniband/hw/ehca/ehca_cq.c
+++ b/drivers/infiniband/hw/ehca/ehca_cq.c
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
--- a/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
--- a/drivers/net/mlx4/Makefile
+++ b/drivers/net/mlx4/Makefile
--- a/drivers/net/mlx4/alloc.c
+++ b/drivers/net/mlx4/alloc.c
--- a/drivers/net/mlx4/cq.c
+++ b/drivers/net/mlx4/cq.c
--- a/drivers/net/mlx4/en_cq.c
+++ b/drivers/net/mlx4/en_cq.c
--- a/drivers/net/mlx4/en_main.c
+++ b/drivers/net/mlx4/en_main.c
--- a/drivers/net/mlx4/en_netdev.c
+++ b/drivers/net/mlx4/en_netdev.c
--- a/drivers/net/mlx4/en_params.c
+++ b/drivers/net/mlx4/en_params.c
--- a/drivers/net/mlx4/en_port.c
+++ b/drivers/net/mlx4/en_port.c
--- a/drivers/net/mlx4/en_port.h
+++ b/drivers/net/mlx4/en_port.h
--- a/drivers/net/mlx4/en_resources.c
+++ b/drivers/net/mlx4/en_resources.c
--- a/drivers/net/mlx4/en_rx.c
+++ b/drivers/net/mlx4/en_rx.c
--- a/drivers/net/mlx4/en_tx.c
+++ b/drivers/net/mlx4/en_tx.c
--- a/drivers/net/mlx4/eq.c
+++ b/drivers/net/mlx4/eq.c
--- a/drivers/net/mlx4/fw.c
+++ b/drivers/net/mlx4/fw.c
--- a/drivers/net/mlx4/fw.h
+++ b/drivers/net/mlx4/fw.h
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
--- a/drivers/net/mlx4/mcg.c
+++ b/drivers/net/mlx4/mcg.c
--- a/drivers/net/mlx4/mlx4.h
+++ b/drivers/net/mlx4/mlx4.h
--- a/drivers/net/mlx4/mlx4_en.h
+++ b/drivers/net/mlx4/mlx4_en.h
--- a/drivers/net/mlx4/mr.c
+++ b/drivers/net/mlx4/mr.c
--- a/drivers/net/mlx4/pd.c
+++ b/drivers/net/mlx4/pd.c
--- a/drivers/net/mlx4/port.c
+++ b/drivers/net/mlx4/port.c
--- a/drivers/net/mlx4/qp.c
+++ b/drivers/net/mlx4/qp.c
--- a/drivers/net/mlx4/srq.c
+++ b/drivers/net/mlx4/srq.c
--- a/include/linux/mlx4/cmd.h
+++ b/include/linux/mlx4/cmd.h
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h