Skip to contentSkip to conversation

firmware,IB/qib: revert firmware file move

PATCH Superseded Mike Marciniszyn 2 participants 2 messages Apr 5, 2013 InfiniBand

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 firmware,IB/qib: revert firmware file move

Commit e2eed58 ("IB/qib: change QLogic to Intel") moved a firmware file potentially breaking the ABI.

This patch reverts that aspect of the fix as well as reverting the firmware name as used in qib.

---
 drivers/infiniband/hw/qib/qib_sd7220.c |    2 
 firmware/Makefile                      |    2 
 firmware/intel/sd7220.fw.ihex          |  513 --------------------------------
 firmware/qlogic/sd7220.fw.ihex         |  513 ++++++++++++++++++++++++++++++++
 4 files changed, 515 insertions(+), 515 deletions(-)
 delete mode 100644 firmware/intel/sd7220.fw.ihex
 create mode 100644 firmware/qlogic/sd7220.fw.ihex
drivers/infiniband/hw/qib/qib_sd7220.c +1 -1
index 08a6c6d..911205d 100644
@@ -44,7 +44,7 @@
 #include "qib.h"
 #include "qib_7220.h"
 
-#define SD7220_FW_NAME "intel/sd7220.fw"
+#define SD7220_FW_NAME "qlogic/sd7220.fw"
 MODULE_FIRMWARE(SD7220_FW_NAME);
 
 /*
firmware/Makefile +1 -1
index 5d8ee13..cbb09ce 100644
@@ -82,7 +82,7 @@ fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \
 fw-shipped-$(CONFIG_SCSI_QLOGIC_1280) += qlogic/1040.bin qlogic/1280.bin \
 					 qlogic/12160.bin
 fw-shipped-$(CONFIG_SCSI_QLOGICPTI) += qlogic/isp1000.bin
-fw-shipped-$(CONFIG_INFINIBAND_QIB) += intel/sd7220.fw
+fw-shipped-$(CONFIG_INFINIBAND_QIB) += qlogic/sd7220.fw
 fw-shipped-$(CONFIG_SND_KORG1212) += korg/k1212.dsp
 fw-shipped-$(CONFIG_SND_MAESTRO3) += ess/maestro3_assp_kernel.fw \
 				     ess/maestro3_assp_minisrc.fw
firmware/intel/sd7220.fw.ihex deleted +0 -513

513 lines not on this page · raw message

firmware/qlogic/sd7220.fw.ihex new file +513 -0

513 lines not on this page · raw message

#1 lore raw
Quoted 2 lines · Mike Marciniszyn

Commit e2eed58 ("IB/qib: change QLogic to Intel") moved a firmware file potentially breaking the ABI.

Please send things like this generated with the "-M" flag so that you can see it as a rename, instead of a huge add/del patch.

Sure, some people may still use traditional "patch", but catering to them when it actually hides what the patch does is just not worth it.

Linus
--
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