From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Woodhouse <dwmw2@infradead•org>
Cc: linux-next@vger•kernel.org,
Jaswinder Singh <jaswinder@infradead•org>,
"David S. Miller" <davem@davemloft•net>
Subject: linux-next: manual merge of the firmware tree
Date: Mon, 1 Sep 2008 16:19:26 +1000 [thread overview]
Message-ID: <20080901161926.d51de879.sfr@canb.auug.org.au> (raw)
Hi David,
Today's linux-next merge of the firmware tree got a conflict in
drivers/scsi/qlogicpti.c between commits
738f2b7b813913e651f39387d007dd961755dee2 ("sparc: Convert all SBUS
drivers to dma_*() interfaces") and
5dc2536bb8d8adb5fdfbe76cd6fdcdf9de3f40f8 ("qlogicpti: Convert to pure OF
driver") from the sparc tree and commit
229d9a03273684dc2175821be4104dbaa52f3ce0 ("qlogicpti: use
request_firmware") from the firmware tree.
Just simple clashes. I fixed it up (see below) and can carry the fixup.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/scsi/qlogicpti.c
index 4280767,1b6594e..0000000
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@@ -25,9 -25,7 +25,10 @@@
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/jiffies.h>
+#include <linux/dma-mapping.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+ #include <linux/firmware.h>
#include <asm/byteorder.h>
@@@ -1456,7 -1470,8 +1474,8 @@@ static void __exit qpti_exit(void
MODULE_DESCRIPTION("QlogicISP SBUS driver");
MODULE_AUTHOR("David S. Miller (davem@davemloft•net)");
MODULE_LICENSE("GPL");
-MODULE_VERSION("2.0");
+MODULE_VERSION("2.1");
+ MODULE_FIRMWARE("qlogic/isp1000.bin");
module_init(qpti_init);
module_exit(qpti_exit);
next reply other threads:[~2008-09-01 6:19 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-01 6:19 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-11-28 5:03 linux-next: manual merge of the firmware tree Stephen Rothwell
2008-11-29 0:14 ` Divy Le Ray
2008-11-29 0:48 ` Stephen Rothwell
2008-11-29 10:11 ` David Woodhouse
2008-11-25 7:21 Stephen Rothwell
2008-10-15 7:58 Stephen Rothwell
2008-08-28 5:38 Stephen Rothwell
2008-08-28 13:51 ` Takashi Iwai
2008-07-29 4:27 Stephen Rothwell
2008-07-11 6:02 Stephen Rothwell
2008-07-07 16:02 Stephen Rothwell
2008-06-30 9:17 Stephen Rothwell
2008-06-30 9:14 Stephen Rothwell
2008-06-30 9:09 Stephen Rothwell
2008-06-30 9:24 ` David Woodhouse
2008-06-30 9:33 ` Stephen Rothwell
2008-06-26 13:38 Stephen Rothwell
2008-06-26 13:51 ` Takashi Iwai
2008-06-26 15:42 ` Stephen Rothwell
2008-06-26 15:47 ` David Woodhouse
2008-06-30 9:23 ` Stephen Rothwell
2008-06-30 9:27 ` David Woodhouse
2008-06-30 9:32 ` Stephen Rothwell
2008-06-24 6:55 Stephen Rothwell
2008-06-24 7:57 ` Stephen Rothwell
2008-06-24 8:04 ` David Woodhouse
2008-06-24 11:20 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080901161926.d51de879.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=dwmw2@infradead$(echo .)org \
--cc=jaswinder@infradead$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox