Skip to contentSkip to conversation

please pull infiniband.git

GIT PULL Roland Dreier 2 participants 2 messages Mar 25, 2013 – Apr 5, 2013 InfiniBand

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull from

git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git tags/rdma-for-linus

----------------------------------------------------------------

Small batch of InfiniBand/RDMA fixes for 3.9:

- Fix for TX lockup in IPoIB
- QLogic -> Intel update for qib driver
- Small static checker fix for qib
- Fix error path return value in cxgb4

----------------------------------------------------------------
Dan Carpenter (1):
IB/ipath: Silence a static checker warning

Mike Marciniszyn (1):
IPoIB: Fix send lockup due to missed TX completion

Roland Dreier (1):
Merge branches 'cxgb4', 'ipoib' and 'qib' into for-next

Vinit Agnihotri (1):
IB/qib: change QLogic to Intel

Wei Yongjun (1):
RDMA/cxgb4: Fix error return code in create_qp()

 drivers/infiniband/hw/cxgb4/qp.c          | 4 +++-
 drivers/infiniband/hw/ipath/ipath_verbs.c | 2 +-
 drivers/infiniband/hw/qib/Kconfig         | 6 +++---
 drivers/infiniband/hw/qib/qib_driver.c    | 5 +++--
 drivers/infiniband/hw/qib/qib_iba6120.c   | 3 ++-
 drivers/infiniband/hw/qib/qib_init.c      | 8 ++++----
 drivers/infiniband/hw/qib/qib_sd7220.c    | 4 ++--
 drivers/infiniband/hw/qib/qib_verbs.c     | 4 ++--
 drivers/infiniband/ulp/ipoib/ipoib_cm.c   | 8 ++++++--
 firmware/Makefile                         | 2 +-
 firmware/{qlogic => intel}/sd7220.fw.ihex | 0
 11 files changed, 27 insertions(+), 19 deletions(-)
 rename firmware/{qlogic => intel}/sd7220.fw.ihex (100%)

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#1 lore raw
Quoted 11 lines · Roland Dreier

Hi Linus,

Please pull from

git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git tags/rdma-for-linus

Vinit Agnihotri (1):
IB/qib: change QLogic to Intel

 firmware/Makefile                         | 2 +-
 firmware/{qlogic => intel}/sd7220.fw.ihex | 0

This is an ABI change, and it's wrong. Moving the firmware from one location to another breaks drivers which look for it in one place when it is actually in the other.

Besides, the firmware/ directory of the kernel is deprecated and very few people actually use it. I don't think *any* distributions do anything other than ignore its contents, or have done for some years. Any changes need to be made in the separate linux-firmware repository. I don't recall seeing this change being submitted there, and if it *was* it would have been rejected on the basis that it breaks old kernels. Unless we *duplicate* the file in both qlogic/ and intel/ directories, but that's just silly.

We already have a *bunch* of other firmwares in the qlogic/ directory which nobody seems interested in moving. There is no point in this marketing-driven revisionism; please leave this one where it is too.

Please revert this part of commit e2eed58b4 before 3.9. Thanks.

Signature · 1 line
dwmw2