* linux-next: manual merge of the scsi tree with the net-current tree
@ 2009-04-03 0:51 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2009-04-03 0:51 UTC (permalink / raw)
To: James Bottomley; +Cc: linux-next, Jaswinder Singh Rajput, David S. Miller
Hi James,
Today's linux-next merge of the scsi tree got a conflict in
firmware/Makefile between commit 75bf758f906315820cada99c169bd89bab3f4ba2
("smc91c92_cs: use request_firmware") from the net-current tree and
commits fa8bed9af023e5b5796d74e3f32dd0a50eb61a1b ("[SCSI] qla1280: use
request_firmware") and ba82e358035ce3014820e07c8bb569eba99c2979 ("[SCSI]
advansys: use request_firmware") from the scsi tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc firmware/Makefile
index baf5ae4,f1ac341..0000000
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@@ -40,7 -39,10 +40,11 @@@ fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb
fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin
fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \
e100/d102e_ucode.bin
+fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin
+ fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \
+ advansys/3550.bin advansys/38C0800.bin
+ fw-shipped-$(CONFIG_SCSI_QLOGIC_1280) += qlogic/1040.bin qlogic/1280.bin \
+ qlogic/12160.bin
fw-shipped-$(CONFIG_SMCTR) += tr_smctr.bin
fw-shipped-$(CONFIG_SND_KORG1212) += korg/k1212.dsp
fw-shipped-$(CONFIG_SND_MAESTRO3) += ess/maestro3_assp_kernel.fw \
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-04-03 0:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-04-03 0:51 linux-next: manual merge of the scsi tree with the net-current tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).