* linux-next: manual merge of the firmware tree
@ 2008-06-30 9:09 Stephen Rothwell
2008-06-30 9:24 ` David Woodhouse
0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2008-06-30 9:09 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Jaswinder Singh, Chas Williams, David Miller
[-- Attachment #1: Type: text/plain, Size: 493 bytes --]
Hi David,
Today's linux-next merge of the firmware tree got a major conflict
between commit e92481f95375aa2702ea5018b0295792ae0fa9c1 ("atm: [fore200e]
convert to use request_firmware()") from the net tree and commit
ef15231d8a30e501b5471ad97a07359e39ceab00 ("fore200e: use request_firmware
()") from the firmware tree.
I reverted the latter from the firmware tree for now.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the firmware tree
2008-06-30 9:09 linux-next: manual merge of the firmware tree Stephen Rothwell
@ 2008-06-30 9:24 ` David Woodhouse
2008-06-30 9:33 ` Stephen Rothwell
0 siblings, 1 reply; 28+ messages in thread
From: David Woodhouse @ 2008-06-30 9:24 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Jaswinder Singh, Chas Williams, David Miller
On Mon, 2008-06-30 at 19:09 +1000, Stephen Rothwell wrote:
> Hi David,
>
> Today's linux-next merge of the firmware tree got a major conflict
> between commit e92481f95375aa2702ea5018b0295792ae0fa9c1 ("atm: [fore200e]
> convert to use request_firmware()") from the net tree and commit
> ef15231d8a30e501b5471ad97a07359e39ceab00 ("fore200e: use request_firmware
> ()") from the firmware tree.
>
> I reverted the latter from the firmware tree for now.
Oops, sorry -- I'd forgotten about that patch, and I let Jaswinder go
ahead and do it again.
I think the reason I didn't apply the patch from Chas to my tree was
because I'm trying to be very careful to preserve functionality -- when
I ask Linus to pull the firmware tree, I still want people to be able to
build in _all_ the firmware they could before.
I'm happy enough to see it done separately though; I'll drop our
fore200e patch from the firmware-2.6.git tree.
--
dwmw2
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the firmware tree
2008-06-30 9:24 ` David Woodhouse
@ 2008-06-30 9:33 ` Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2008-06-30 9:33 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Jaswinder Singh, Chas Williams, David Miller
[-- Attachment #1: Type: text/plain, Size: 719 bytes --]
Hi David,
On Mon, 30 Jun 2008 10:24:13 +0100 David Woodhouse <dwmw2@infradead•org> wrote:
>
> Oops, sorry -- I'd forgotten about that patch, and I let Jaswinder go
> ahead and do it again.
>
> I think the reason I didn't apply the patch from Chas to my tree was
> because I'm trying to be very careful to preserve functionality -- when
> I ask Linus to pull the firmware tree, I still want people to be able to
> build in _all_ the firmware they could before.
>
> I'm happy enough to see it done separately though; I'll drop our
> fore200e patch from the firmware-2.6.git tree.
OK, thanks.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread
* linux-next: manual merge of the firmware tree
@ 2008-11-28 5:03 Stephen Rothwell
2008-11-29 0:14 ` Divy Le Ray
0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2008-11-28 5:03 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Divy Le Ray, David S. Miller, Jaswinder Singh
Hi David,
Today's linux-next merge of the firmware tree got conflicts in
firmware/Makefile and firmware/WHENCE between commit
ad58633c8381e88b54055771877726d3d5d24734 ("cxgb3: integrate FW and
protocol engines in the kernel") from the net tree and various commits
from the firmware tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix.
Is it time that some of these went to their respective maintainers?
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc firmware/Makefile
index 4993a4b,ac55853..0000000
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@@ -24,10 -33,15 +33,18 @@@ fw-shipped-$(CONFIG_ATARI_DSP56K) += ds
fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw
fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin
+fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
+ cxgb3/t3c_psram-1.1.0.bin \
+ cxgb3/t3fw-7.0.0.bin
+ fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin
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_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_SCSI_QLOGICPTI) += qlogic/isp1000.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 \
diff --cc firmware/WHENCE
index 8f06639,cfab534..0000000
--- a/firmware/WHENCE
+++ b/firmware/WHENCE
@@@ -350,13 -350,123 +350,133 @@@ Found in hex form in kernel source
--------------------------------------------------------------------------
+Driver: cxgb3 - Chelsio Terminator 3 1G/10G Ethernet adapter
+
+File: cxgb3/t3b_psram-1.1.0.bin.ihex
+File: cxgb3/t3c_psram-1.1.0.bin.ihex
+file: cxgb3/t3fw-7.0.0.bin.ihex
+
+License: GPLv2 or OpenIB.org BSD license, no source visible
+
+--------------------------------------------------------------------------
+
+ Driver: e100 -- Intel PRO/100 Ethernet NIC
+
+ File: e100/d101m_ucode.bin
+ File: e100/d101s_ucode.bin
+ File: e100/d102e_ucode.bin
+
+ Licence: Unknown
+
+ Found in hex form in kernel source.
+
+ --------------------------------------------------------------------------
+
+ Driver: acenic -- Alteon AceNIC Gigabit Ethernet card
+
+ File: acenic/tg1.bin
+ File: acenic/tg2.bin
+
+ Licence: Unknown
+
+ Found in hex form in kernel source, but source allegedly available at
+ http://alteon.shareable.org/
+
+ --------------------------------------------------------------------------
+
+ Driver: tigon3 -- Broadcom Tigon3 based gigabit Ethernet cards
+
+ File: tigon/tg3.bin
+ File: tigon/tg3_tso.bin
+ File: tigon/tg3_tso5.bin
+
+ Licence:
+ * Firmware is:
+ * Derived from proprietary unpublished source code,
+ * Copyright (C) 2000-2003 Broadcom Corporation.
+ *
+ * Permission is hereby granted for the distribution of this firmware
+ * data in hexadecimal or equivalent format, provided this copyright
+ * notice is accompanying it.
+
+ Found in hex form in kernel source.
+
+ --------------------------------------------------------------------------
+
+ Driver: DVB AV7110 -- AV7110 cards
+
+ File: av7110/bootcode.bin
+
+ Licence: GPLv2 or later
+
+ ARM assembly source code available at http://www.linuxtv.org/downloads/firmware/Boot.S
+
+ --------------------------------------------------------------------------
+
+ Driver: SCSI_QLOGIC_1280 - Qlogic QLA 1240/1x80/1x160 SCSI support
+
+ File: qlogic/1040.bin
+ File: qlogic/1280.bin
+ File: qlogic/12160.bin
+
+ Licence: Allegedly GPLv2+, but no source visible. Marked:
+
+ QLOGIC LINUX SOFTWARE
+ QLogic ISP1280/ device driver for Linux 2.2.x and 2.4.x
+ Copyright (C) 2001 Qlogic Corporation (www.qlogic.com)
+
+ --------------------------------------------------------------------------
+
+ Driver: SCSI_ADVANSYS - AdvanSys SCSI
+
+ File: advansys/mcode.bin
+ File: advansys/3550.bin
+ File: advansys/38C0800.bin
+ File: advansys/38C1600.bin
+
+ Licence: Allegedly GPLv2+, but no source visible.
+
+ Found in hex form in kernel source.
+
+ --------------------------------------------------------------------------
+
+ Driver: SCSI_QLOGICPTI - PTI Qlogic, ISP Driver
+
+ File: qlogic/isp1000.bin
+
+ Licence: Unknown
+
+ Found in hex form in kernel source.
+
+ --------------------------------------------------------------------------
+
+ Driver: ADAPTEC_STARFIRE - Adaptec Starfire/DuraLAN support
+
+ File: adaptec/starfire_rx.bin
+ File: adaptec/starfire_tx.bin
+
+ Licence: Allegedly GPLv2, but no source visible.
+
+ Found in hex form in kernel source, with the following notice:
+
+ BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE IT IS LICENSED "AS IS" AND
+ THERE IS NO WARRANTY FOR THE PROGRAM, INCLUDING BUT NOT LIMITED TO THE
+ IMPLIED WARRANTIES OF MERCHANTIBILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ (TO THE EXTENT PERMITTED BY APPLICABLE LAW). USE OF THE PROGRAM IS AT YOUR
+ OWN RISK. IN NO EVENT WILL ADAPTEC OR ITS LICENSORS BE LIABLE TO YOU FOR
+ DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM.
+
+ --------------------------------------------------------------------------
+
+ Driver: wavefront - ISA WaveFront sound card
+
+ File: yamaha/yss225_registers.bin
+
+ Licence: Allegedly GPLv2+, but no source visible.
+
+ Found in hex form in kernel source, with the following comment:
+ Copyright (c) 1998-2002 by Paul Davis <pbd@op•net>
+
+
+ --------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the firmware tree
2008-11-28 5:03 Stephen Rothwell
@ 2008-11-29 0:14 ` Divy Le Ray
2008-11-29 0:48 ` Stephen Rothwell
0 siblings, 1 reply; 28+ messages in thread
From: Divy Le Ray @ 2008-11-29 0:14 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Woodhouse, linux-next, David S. Miller, Jaswinder Singh
Stephen Rothwell wrote:
> Hi David,
>
> Today's linux-next merge of the firmware tree got conflicts in
> firmware/Makefile and firmware/WHENCE between commit
> ad58633c8381e88b54055771877726d3d5d24734 ("cxgb3: integrate FW and
> protocol engines in the kernel") from the net tree and various commits
> from the firmware tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix.
>
> Is it time that some of these went to their respective maintainers?
> --
Hi Stephen,
I created this situation and apologize for it. I should have sent the
patch to the firmware tree maintainer.
Cheers,
Divy
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the firmware tree
2008-11-29 0:14 ` Divy Le Ray
@ 2008-11-29 0:48 ` Stephen Rothwell
2008-11-29 10:11 ` David Woodhouse
0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2008-11-29 0:48 UTC (permalink / raw)
To: Divy Le Ray; +Cc: David Woodhouse, linux-next, David S. Miller, Jaswinder Singh
[-- Attachment #1: Type: text/plain, Size: 631 bytes --]
Hi Divy,
On Fri, 28 Nov 2008 16:14:46 -0800 Divy Le Ray <divy@chelsio•com> wrote:
>
> I created this situation and apologize for it. I should have sent the
> patch to the firmware tree maintainer.
Its not a big issue - the conflict has a very obvious resolution and "git
rerere" remembers it for me. As far as I know, there is no "firmware
maintainer" - David just has a git tree that was used when the initial
conversions were done. Some of those have not yet been finalised and so
are still in his tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: linux-next: manual merge of the firmware tree
2008-11-29 0:48 ` Stephen Rothwell
@ 2008-11-29 10:11 ` David Woodhouse
0 siblings, 0 replies; 28+ messages in thread
From: David Woodhouse @ 2008-11-29 10:11 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Divy Le Ray, linux-next, David S. Miller, Jaswinder Singh
On Sat, 2008-11-29 at 11:48 +1100, Stephen Rothwell wrote:
> On Fri, 28 Nov 2008 16:14:46 -0800 Divy Le Ray <divy@chelsio•com> wrote:
> > I created this situation and apologize for it. I should have sent the
> > patch to the firmware tree maintainer.
No, I think you did the right thing. Thank you for the patch.
> Its not a big issue - the conflict has a very obvious resolution and "git
> rerere" remembers it for me. As far as I know, there is no "firmware
> maintainer" - David just has a git tree that was used when the initial
> conversions were done. Some of those have not yet been finalised and so
> are still in his tree.
I had said that it's time for the 'firmware tree' to be discarded, and
the patches pushed upstream via the appropriate maintainers. The reason
I'd waited was because I'd told DaveM I'd wait for the dust to settle on
the first round of patches before sending the rest.
Now I'm a little concerned about the conflicts in the WHENCE file if we
have patches going through different routes. Perhaps we should stop just
adding stuff at the _end_ and sort it? Or rearrange it differently?
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel•com Intel Corporation
^ permalink raw reply [flat|nested] 28+ messages in thread
* linux-next: manual merge of the firmware tree
@ 2008-11-25 7:21 Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2008-11-25 7:21 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Matt Carlson, David S. Miller
[-- Attachment #1: Type: text/plain, Size: 594 bytes --]
Hi David,
Today's linux-next merge of the firmware tree got a conflict in
drivers/net/tg3.c between commit d5fe488a7b59e41b98b91137805159466b7b49c2
("tg3: Embrace pci_ioremap_bar()") from the net tree and commit
aadd3ed38a6745e21dc8d2f388bbba42ead0a085 ("firmware: convert tg3 driver
to request_firmware()") from the firmware tree.
The former removed some code that the latter modified. I have fixed it
up (by removing the hunk of code) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread* linux-next: manual merge of the firmware tree
@ 2008-10-15 7:58 Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2008-10-15 7:58 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Jaswinder Singh
Hi David,
Today's linux-next merge of the firmware tree got a conflict in
firmware/WHENCE between commit fcaa40669cd798ca2ac0d15441e8a1d1145f2b16
("cassini: use request_firmware") from Linus' tree and commit
9e0fa5d599deeb9e34376af4f7c645b69b577758 ("firmware: convert e100 driver
to request_firmware()") from the firmware tree.
Just overlapping additions. I fixed it up (see below).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc firmware/WHENCE
index 57002cd,a4c83e1..0000000
--- a/firmware/WHENCE
+++ b/firmware/WHENCE
@@@ -340,12 -340,123 +340,133 @@@ Found in hex form in kernel source
--------------------------------------------------------------------------
+Driver: CASSINI - Sun Cassini
+
+File: sun/cassini.bin
+
+Licence: Unknown
+
+Found in hex form in kernel source.
+
+--------------------------------------------------------------------------
++
+ Driver: e100 -- Intel PRO/100 Ethernet NIC
+
+ File: e100/d101m_ucode.bin
+ File: e100/d101s_ucode.bin
+ File: e100/d102e_ucode.bin
+
+ Licence: Unknown
+
+ Found in hex form in kernel source.
+
+ --------------------------------------------------------------------------
+
+ Driver: acenic -- Alteon AceNIC Gigabit Ethernet card
+
+ File: acenic/tg1.bin
+ File: acenic/tg2.bin
+
+ Licence: Unknown
+
+ Found in hex form in kernel source, but source allegedly available at
+ http://alteon.shareable.org/
+
+ --------------------------------------------------------------------------
+
+ Driver: tigon3 -- Broadcom Tigon3 based gigabit Ethernet cards
+
+ File: tigon/tg3.bin
+ File: tigon/tg3_tso.bin
+ File: tigon/tg3_tso5.bin
+
+ Licence:
+ * Firmware is:
+ * Derived from proprietary unpublished source code,
+ * Copyright (C) 2000-2003 Broadcom Corporation.
+ *
+ * Permission is hereby granted for the distribution of this firmware
+ * data in hexadecimal or equivalent format, provided this copyright
+ * notice is accompanying it.
+
+ Found in hex form in kernel source.
+
+ --------------------------------------------------------------------------
+
+ Driver: DVB AV7110 -- AV7110 cards
+
+ File: av7110/bootcode.bin
+
+ Licence: GPLv2 or later
+
+ ARM assembly source code available at http://www.linuxtv.org/downloads/firmware/Boot.S
+
+ --------------------------------------------------------------------------
+
+ Driver: SCSI_QLOGIC_1280 - Qlogic QLA 1240/1x80/1x160 SCSI support
+
+ File: qlogic/1040.bin
+ File: qlogic/1280.bin
+ File: qlogic/12160.bin
+
+ Licence: Allegedly GPLv2+, but no source visible. Marked:
+
+ QLOGIC LINUX SOFTWARE
+ QLogic ISP1280/ device driver for Linux 2.2.x and 2.4.x
+ Copyright (C) 2001 Qlogic Corporation (www.qlogic.com)
+
+ --------------------------------------------------------------------------
+
+ Driver: SCSI_ADVANSYS - AdvanSys SCSI
+
+ File: advansys/mcode.bin
+ File: advansys/3550.bin
+ File: advansys/38C0800.bin
+ File: advansys/38C1600.bin
+
+ Licence: Allegedly GPLv2+, but no source visible.
+
+ Found in hex form in kernel source.
+
+ --------------------------------------------------------------------------
+
+ Driver: SCSI_QLOGICPTI - PTI Qlogic, ISP Driver
+
+ File: qlogic/isp1000.bin
+
+ Licence: Unknown
+
+ Found in hex form in kernel source.
+
+ --------------------------------------------------------------------------
+
+ Driver: ADAPTEC_STARFIRE - Adaptec Starfire/DuraLAN support
+
+ File: adaptec/starfire_rx.bin
+ File: adaptec/starfire_tx.bin
+
+ Licence: Allegedly GPLv2, but no source visible.
+
+ Found in hex form in kernel source, with the following notice:
+
+ BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE IT IS LICENSED "AS IS" AND
+ THERE IS NO WARRANTY FOR THE PROGRAM, INCLUDING BUT NOT LIMITED TO THE
+ IMPLIED WARRANTIES OF MERCHANTIBILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ (TO THE EXTENT PERMITTED BY APPLICABLE LAW). USE OF THE PROGRAM IS AT YOUR
+ OWN RISK. IN NO EVENT WILL ADAPTEC OR ITS LICENSORS BE LIABLE TO YOU FOR
+ DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM.
+
+ --------------------------------------------------------------------------
+
+ Driver: wavefront - ISA WaveFront sound card
+
+ File: yamaha/yss225_registers.bin
+
+ Licence: Allegedly GPLv2+, but no source visible.
+
+ Found in hex form in kernel source, with the following comment:
+ Copyright (c) 1998-2002 by Paul Davis <pbd@op•net>
+
+
+ --------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 28+ messages in thread* linux-next: manual merge of the firmware tree
@ 2008-09-01 6:19 Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2008-09-01 6:19 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Jaswinder Singh, David S. Miller
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);
^ permalink raw reply [flat|nested] 28+ messages in thread* linux-next: manual merge of the firmware tree
@ 2008-08-28 5:38 Stephen Rothwell
2008-08-28 13:51 ` Takashi Iwai
0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2008-08-28 5:38 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Takashi Iwai, Jaswinder Singh
Hi David,
Today's linux-next merge of the firmware tree got a conflict in
firmware/Makefile firmware/WHENCE between commit
d45ffcde084ce14815bf672e5ea0fc81d1f7ffc0 ("ALSA: wavefront - Always use
request_firmware()") from the sound tree and various commits from the
firmware tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc firmware/Makefile
index f40ea7e,f3fb9e1..0000000
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@@ -34,7 -51,8 +51,9 @@@ fw-shipped-$(CONFIG_SND_SB16_CSP) += sb
sb16/ima_adpcm_capture.csp
fw-shipped-$(CONFIG_SND_YMFPCI) += yamaha/ds1_ctrl.fw yamaha/ds1_dsp.fw \
yamaha/ds1e_ctrl.fw
+fw-shipped-$(CONFIG_SND_WAVEFRONT) += yamaha/yss225_registers.bin
+ fw-shipped-$(CONFIG_TIGON3) += tigon/tg3.bin tigon/tg3_tso.bin \
+ tigon/tg3_tso5.bin
fw-shipped-$(CONFIG_USB_DABUSB) += dabusb/firmware.fw dabusb/bitstream.bin
fw-shipped-$(CONFIG_USB_EMI26) += emi26/loader.fw emi26/firmware.fw \
emi26/bitstream.fw
diff --cc firmware/WHENCE
index e31e5fc,c086cc3..0000000
--- a/firmware/WHENCE
+++ b/firmware/WHENCE
@@@ -340,13 -340,111 +340,122 @@@ Found in hex form in kernel source
--------------------------------------------------------------------------
+ Driver: e100 -- Intel PRO/100 Ethernet NIC
+
+ File: e100/d101m_ucode.bin
+ File: e100/d101s_ucode.bin
+ File: e100/d102e_ucode.bin
+
+ Licence: Unknown
+
+ Found in hex form in kernel source.
+
+ --------------------------------------------------------------------------
+
+ Driver: acenic -- Alteon AceNIC Gigabit Ethernet card
+
+ File: acenic/tg1.bin
+ File: acenic/tg2.bin
+
+ Licence: Unknown
+
+ Found in hex form in kernel source, but source allegedly available at
+ http://alteon.shareable.org/
+
+ --------------------------------------------------------------------------
+
+ Driver: tigon3 -- Broadcom Tigon3 based gigabit Ethernet cards
+
+ File: tigon/tg3.bin
+ File: tigon/tg3_tso.bin
+ File: tigon/tg3_tso5.bin
+
+ Licence:
+ * Firmware is:
+ * Derived from proprietary unpublished source code,
+ * Copyright (C) 2000-2003 Broadcom Corporation.
+ *
+ * Permission is hereby granted for the distribution of this firmware
+ * data in hexadecimal or equivalent format, provided this copyright
+ * notice is accompanying it.
+
+ Found in hex form in kernel source.
+
+ --------------------------------------------------------------------------
+
+ Driver: DVB AV7110 -- AV7110 cards
+
+ File: av7110/bootcode.bin
+
+ Licence: GPLv2 or later
+
+ ARM assembly source code available at http://www.linuxtv.org/downloads/firmware/Boot.S
+
+ --------------------------------------------------------------------------
+
+ Driver: SCSI_QLOGIC_1280 - Qlogic QLA 1240/1x80/1x160 SCSI support
+
+ File: qlogic/1040.bin
+ File: qlogic/1280.bin
+ File: qlogic/12160.bin
+
+ Licence: Allegedly GPLv2+, but no source visible. Marked:
+
+ QLOGIC LINUX SOFTWARE
+ QLogic ISP1280/ device driver for Linux 2.2.x and 2.4.x
+ Copyright (C) 2001 Qlogic Corporation (www.qlogic.com)
+
+ --------------------------------------------------------------------------
+
+ Driver: SCSI_ADVANSYS - AdvanSys SCSI
+
+ File: advansys/mcode.bin
+ File: advansys/3550.bin
+ File: advansys/38C0800.bin
+ File: advansys/38C1600.bin
+
+ Licence: Allegedly GPLv2+, but no source visible.
+
+ Found in hex form in kernel source.
+
+ --------------------------------------------------------------------------
+
+ Driver: SCSI_QLOGICPTI - PTI Qlogic, ISP Driver
+
+ File: qlogic/isp1000.bin
+
+ Licence: Unknown
+
+ Found in hex form in kernel source.
+
+ --------------------------------------------------------------------------
+
+ Driver: ADAPTEC_STARFIRE - Adaptec Starfire/DuraLAN support
+
+ File: adaptec/starfire_rx.bin
+ File: adaptec/starfire_tx.bin
+
+ Licence: Allegedly GPLv2, but no source visible.
+
+ Found in hex form in kernel source, with the following notice:
+
+ BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE IT IS LICENSED "AS IS" AND
+ THERE IS NO WARRANTY FOR THE PROGRAM, INCLUDING BUT NOT LIMITED TO THE
+ IMPLIED WARRANTIES OF MERCHANTIBILITY OR FITNESS FOR A PARTICULAR PURPOSE
+ (TO THE EXTENT PERMITTED BY APPLICABLE LAW). USE OF THE PROGRAM IS AT YOUR
+ OWN RISK. IN NO EVENT WILL ADAPTEC OR ITS LICENSORS BE LIABLE TO YOU FOR
+ DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM.
+
+ --------------------------------------------------------------------------
++
+Driver: wavefront - ISA WaveFront sound card
+
+File: yamaha/yss225_registers.bin
+
+License: GPLv2+
+
+Found in hex form in kernel source, with the following comment:
+ Copyright (c) 1998-2002 by Paul Davis <pbd@op•net>
+
+--------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the firmware tree
2008-08-28 5:38 Stephen Rothwell
@ 2008-08-28 13:51 ` Takashi Iwai
0 siblings, 0 replies; 28+ messages in thread
From: Takashi Iwai @ 2008-08-28 13:51 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: David Woodhouse, linux-next, Jaswinder Singh
At Thu, 28 Aug 2008 15:38:10 +1000,
Stephen Rothwell wrote:
>
> Hi David,
>
> Today's linux-next merge of the firmware tree got a conflict in
> firmware/Makefile firmware/WHENCE between commit
> d45ffcde084ce14815bf672e5ea0fc81d1f7ffc0 ("ALSA: wavefront - Always use
> request_firmware()") from the sound tree and various commits from the
> firmware tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix.
Thanks. I took back my part of the change so that David could merge
it into his tree later.
Takashi
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
> diff --cc firmware/Makefile
> index f40ea7e,f3fb9e1..0000000
> --- a/firmware/Makefile
> +++ b/firmware/Makefile
> @@@ -34,7 -51,8 +51,9 @@@ fw-shipped-$(CONFIG_SND_SB16_CSP) += sb
> sb16/ima_adpcm_capture.csp
> fw-shipped-$(CONFIG_SND_YMFPCI) += yamaha/ds1_ctrl.fw yamaha/ds1_dsp.fw \
> yamaha/ds1e_ctrl.fw
> +fw-shipped-$(CONFIG_SND_WAVEFRONT) += yamaha/yss225_registers.bin
> + fw-shipped-$(CONFIG_TIGON3) += tigon/tg3.bin tigon/tg3_tso.bin \
> + tigon/tg3_tso5.bin
> fw-shipped-$(CONFIG_USB_DABUSB) += dabusb/firmware.fw dabusb/bitstream.bin
> fw-shipped-$(CONFIG_USB_EMI26) += emi26/loader.fw emi26/firmware.fw \
> emi26/bitstream.fw
> diff --cc firmware/WHENCE
> index e31e5fc,c086cc3..0000000
> --- a/firmware/WHENCE
> +++ b/firmware/WHENCE
> @@@ -340,13 -340,111 +340,122 @@@ Found in hex form in kernel source
>
> --------------------------------------------------------------------------
>
> + Driver: e100 -- Intel PRO/100 Ethernet NIC
> +
> + File: e100/d101m_ucode.bin
> + File: e100/d101s_ucode.bin
> + File: e100/d102e_ucode.bin
> +
> + Licence: Unknown
> +
> + Found in hex form in kernel source.
> +
> + --------------------------------------------------------------------------
> +
> + Driver: acenic -- Alteon AceNIC Gigabit Ethernet card
> +
> + File: acenic/tg1.bin
> + File: acenic/tg2.bin
> +
> + Licence: Unknown
> +
> + Found in hex form in kernel source, but source allegedly available at
> + http://alteon.shareable.org/
> +
> + --------------------------------------------------------------------------
> +
> + Driver: tigon3 -- Broadcom Tigon3 based gigabit Ethernet cards
> +
> + File: tigon/tg3.bin
> + File: tigon/tg3_tso.bin
> + File: tigon/tg3_tso5.bin
> +
> + Licence:
> + * Firmware is:
> + * Derived from proprietary unpublished source code,
> + * Copyright (C) 2000-2003 Broadcom Corporation.
> + *
> + * Permission is hereby granted for the distribution of this firmware
> + * data in hexadecimal or equivalent format, provided this copyright
> + * notice is accompanying it.
> +
> + Found in hex form in kernel source.
> +
> + --------------------------------------------------------------------------
> +
> + Driver: DVB AV7110 -- AV7110 cards
> +
> + File: av7110/bootcode.bin
> +
> + Licence: GPLv2 or later
> +
> + ARM assembly source code available at http://www.linuxtv.org/downloads/firmware/Boot.S
> +
> + --------------------------------------------------------------------------
> +
> + Driver: SCSI_QLOGIC_1280 - Qlogic QLA 1240/1x80/1x160 SCSI support
> +
> + File: qlogic/1040.bin
> + File: qlogic/1280.bin
> + File: qlogic/12160.bin
> +
> + Licence: Allegedly GPLv2+, but no source visible. Marked:
> +
> + QLOGIC LINUX SOFTWARE
> + QLogic ISP1280/ device driver for Linux 2.2.x and 2.4.x
> + Copyright (C) 2001 Qlogic Corporation (www.qlogic.com)
> +
> + --------------------------------------------------------------------------
> +
> + Driver: SCSI_ADVANSYS - AdvanSys SCSI
> +
> + File: advansys/mcode.bin
> + File: advansys/3550.bin
> + File: advansys/38C0800.bin
> + File: advansys/38C1600.bin
> +
> + Licence: Allegedly GPLv2+, but no source visible.
> +
> + Found in hex form in kernel source.
> +
> + --------------------------------------------------------------------------
> +
> + Driver: SCSI_QLOGICPTI - PTI Qlogic, ISP Driver
> +
> + File: qlogic/isp1000.bin
> +
> + Licence: Unknown
> +
> + Found in hex form in kernel source.
> +
> + --------------------------------------------------------------------------
> +
> + Driver: ADAPTEC_STARFIRE - Adaptec Starfire/DuraLAN support
> +
> + File: adaptec/starfire_rx.bin
> + File: adaptec/starfire_tx.bin
> +
> + Licence: Allegedly GPLv2, but no source visible.
> +
> + Found in hex form in kernel source, with the following notice:
> +
> + BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE IT IS LICENSED "AS IS" AND
> + THERE IS NO WARRANTY FOR THE PROGRAM, INCLUDING BUT NOT LIMITED TO THE
> + IMPLIED WARRANTIES OF MERCHANTIBILITY OR FITNESS FOR A PARTICULAR PURPOSE
> + (TO THE EXTENT PERMITTED BY APPLICABLE LAW). USE OF THE PROGRAM IS AT YOUR
> + OWN RISK. IN NO EVENT WILL ADAPTEC OR ITS LICENSORS BE LIABLE TO YOU FOR
> + DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
> + ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM.
> +
> + --------------------------------------------------------------------------
> ++
> +Driver: wavefront - ISA WaveFront sound card
> +
> +File: yamaha/yss225_registers.bin
> +
> +License: GPLv2+
> +
> +Found in hex form in kernel source, with the following comment:
> + Copyright (c) 1998-2002 by Paul Davis <pbd@op•net>
> +
> +--------------------------------------------------------------------------
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* linux-next: manual merge of the firmware tree
@ 2008-07-29 4:27 Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2008-07-29 4:27 UTC (permalink / raw)
To: David Woodhouse
Cc: linux-next, Jaswinder Singh, Adrian Bunk, Mauro Carvalho Chehab
[-- Attachment #1: Type: text/plain, Size: 522 bytes --]
Hi David,
Today's linux-next merge of the firmware tree got a conflict in
drivers/media/dvb/ttpci/Kconfig between commit
445c2714cf72817ab1ad3ca894c6d9b2047b3a3e ("V4L/DVB (8534): remove
select's of FW_LOADER") from Linus' tree and commit
06c8b7a8fde544f1145365ab6df2d3254301923f ("firmware: convert av7110
driver to request_firmware()") from the firmware tree.
Just a context conflict. I fixed it up.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread* linux-next: manual merge of the firmware tree
@ 2008-07-11 6:02 Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2008-07-11 6:02 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Alan Cox, Greg KH, Jaswinder Singh
[-- Attachment #1: Type: text/plain, Size: 575 bytes --]
Hi David,
Today's linux-next merge of the firmware tree got conflicts in
drivers/usb/serial/io_ti.c and drivers/usb/serial/io_fw_down3.h between
commit 933485161580b837dd84d46fb1fca7ea775f30c1 ("USB: io_ti: FIrst cut
at a big clean up") from the usb tree and commit
19aeeb5b95d53d0865ae811fc4dcc66639d661cf ("edgeport-ti: use
request_firmware()") from the firmware tree.
I just reverted the firmware tree commit for now as the fixup is quite
extensive.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread* linux-next: manual merge of the firmware tree
@ 2008-07-07 16:02 Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2008-07-07 16:02 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, James Bottomley
[-- Attachment #1: Type: text/plain, Size: 505 bytes --]
Hi David,
Today's linux-next merge of the firmware tree got a conflict in
include/linux/firmware.h between commit
69d44a1835ec8163a82c4ee57367f87ae0f85c2e ("firmware: fix the
request_firmware() dummy") from Linus' tree and commit
81d4e79acbda3c3f8cbdcc7284b643083314e9c8 ("firmware: allow firmware files
to be built into kernel image") from the firmware tree.
It was just contextual.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread* linux-next: manual merge of the firmware tree
@ 2008-06-30 9:17 Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2008-06-30 9:17 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 547 bytes --]
Hi David,
Today's linux-next merge of the firmware tree got a trivial conflict in
drivers/media/dvb/ttpci/Makefile between commit
4575147abb81e7a333f9e38068524e16cf84df30 ("V4L/DVB (8142): ttpci:
tda827x.h is at drivers/media/common") from the v4l-dvb tree and commit
3e1205c15ac97d8056aba3b078aae6eca2647947 ("Remove fdump tool for av7110
firmware") from the firmware tree.
Overlapping add/remove. Fixed up and I can carry it.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread* linux-next: manual merge of the firmware tree
@ 2008-06-30 9:14 Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2008-06-30 9:14 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Chas Williams, David S. Miller
[-- Attachment #1: Type: text/plain, Size: 529 bytes --]
Hi David,
Today's linux-next merge of the firmware tree got a conflict in
drivers/atm/Makefile between commit
e92481f95375aa2702ea5018b0295792ae0fa9c1 ("atm: [fore200e] convert to use
request_firmware()") from the net tree and commit
1bf8d922fe44bdec0126f8cc2e3477c8bc044c3f ("firmware: convert Ambassador
ATM driver to request_firmware()") from the firmware tree.
I fixed it up (just overlapping removals).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread* linux-next: manual merge of the firmware tree
@ 2008-06-26 13:38 Stephen Rothwell
2008-06-26 13:51 ` Takashi Iwai
2008-06-30 9:23 ` Stephen Rothwell
0 siblings, 2 replies; 28+ messages in thread
From: Stephen Rothwell @ 2008-06-26 13:38 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Takashi Iwai
[-- Attachment #1: Type: text/plain, Size: 903 bytes --]
Hi David,
Today's linux-next merge of the firmware tree got conflicts in
sound/pci/Kconfig between commits 829808ac06b33cdc678ad7dbd628d71d65f8a9c3
("[ALSA] Fix AC97 kconfig items") and
03cf8be8c43b8c7febc5aacc110fd6a0bff00aa7 ("sound: Convert to menuconfig")
from the sound tree and commits aee133db3305c4eb85a2d024db613ff44e714f20 ("firmware: convert korg1212 driver to use firmware loader exclusively"), 8fa5ae5506e4a5f69a0c662bc499d8992a2e26c8 ("firmware: convert maestro3 driver to use firmware loader exclusively") and 62bd53e67f6516ce6ec6c3c40db5d8868c7b2487
("firmware: convert ymfpci driver to use firmware loader exclusively")
from the firmware tree.
I can carry the obvious fixups for these.
I may have previously reported these (erroneously) against sound/Kconfig.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the firmware tree
2008-06-26 13:38 Stephen Rothwell
@ 2008-06-26 13:51 ` Takashi Iwai
2008-06-26 15:42 ` Stephen Rothwell
2008-06-30 9:23 ` Stephen Rothwell
1 sibling, 1 reply; 28+ messages in thread
From: Takashi Iwai @ 2008-06-26 13:51 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: David Woodhouse, linux-next
> Hi David,
>
> Today's linux-next merge of the firmware tree got conflicts in
> sound/pci/Kconfig between commits 829808ac06b33cdc678ad7dbd628d71d65f8a9c3
> ("[ALSA] Fix AC97 kconfig items") and
> 03cf8be8c43b8c7febc5aacc110fd6a0bff00aa7 ("sound: Convert to menuconfig")
> from the sound tree and commits aee133db3305c4eb85a2d024db613ff44e714f20 ("firmware: convert korg1212 driver to use firmware loader exclusively"), 8fa5ae5506e4a5f69a0c662bc499d8992a2e26c8 ("firmware: convert maestro3 driver to use firmware loader exclusively") and 62bd53e67f6516ce6ec6c3c40db5d8868c7b2487
> ("firmware: convert ymfpci driver to use firmware loader exclusively")
> from the firmware tree.
>
> I can carry the obvious fixups for these.
>
> I may have previously reported these (erroneously) against
> sound/Kconfig.
Maybe it's because I rebased the master branch of sound-2.6.git.
Is the fix almost identical with the previous one, I guess?
thanks,
Takashi
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the firmware tree
2008-06-26 13:51 ` Takashi Iwai
@ 2008-06-26 15:42 ` Stephen Rothwell
2008-06-26 15:47 ` David Woodhouse
0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2008-06-26 15:42 UTC (permalink / raw)
To: Takashi Iwai; +Cc: David Woodhouse, linux-next
[-- Attachment #1: Type: text/plain, Size: 439 bytes --]
Hi Takashi,
On Thu, 26 Jun 2008 15:51:50 +0200 Takashi Iwai <tiwai@suse•de> wrote:
>
> > I may have previously reported these (erroneously) against
> > sound/Kconfig.
>
> Maybe it's because I rebased the master branch of sound-2.6.git.
> Is the fix almost identical with the previous one, I guess?
That would do it.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: linux-next: manual merge of the firmware tree
2008-06-26 15:42 ` Stephen Rothwell
@ 2008-06-26 15:47 ` David Woodhouse
0 siblings, 0 replies; 28+ messages in thread
From: David Woodhouse @ 2008-06-26 15:47 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Takashi Iwai, linux-next
On Fri, 2008-06-27 at 01:42 +1000, Stephen Rothwell wrote:
>
> > Maybe it's because I rebased the master branch of sound-2.6.git.
> > Is the fix almost identical with the previous one, I guess?
>
> That would do it.
I rebased (well, recommitted) mine too, just to make sure :)
--
dwmw2
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: linux-next: manual merge of the firmware tree
2008-06-26 13:38 Stephen Rothwell
2008-06-26 13:51 ` Takashi Iwai
@ 2008-06-30 9:23 ` Stephen Rothwell
2008-06-30 9:27 ` David Woodhouse
1 sibling, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2008-06-30 9:23 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Takashi Iwai
[-- Attachment #1: Type: text/plain, Size: 1122 bytes --]
Hi David,
On Thu, 26 Jun 2008 23:38:33 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the firmware tree got conflicts in
> sound/pci/Kconfig between commits 829808ac06b33cdc678ad7dbd628d71d65f8a9c3
> ("[ALSA] Fix AC97 kconfig items") and
> 03cf8be8c43b8c7febc5aacc110fd6a0bff00aa7 ("sound: Convert to menuconfig")
> from the sound tree and commits aee133db3305c4eb85a2d024db613ff44e714f20 ("firmware: convert korg1212 driver to use firmware loader exclusively"), 8fa5ae5506e4a5f69a0c662bc499d8992a2e26c8 ("firmware: convert maestro3 driver to use firmware loader exclusively") and 62bd53e67f6516ce6ec6c3c40db5d8868c7b2487
> ("firmware: convert ymfpci driver to use firmware loader exclusively")
> from the firmware tree.
>
> I can carry the obvious fixups for these.
>
> I may have previously reported these (erroneously) against sound/Kconfig.
This has come up again today. I assume there has been some
rebasing/modification of the commits involved.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the firmware tree
2008-06-30 9:23 ` Stephen Rothwell
@ 2008-06-30 9:27 ` David Woodhouse
2008-06-30 9:32 ` Stephen Rothwell
0 siblings, 1 reply; 28+ messages in thread
From: David Woodhouse @ 2008-06-30 9:27 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Takashi Iwai
On Mon, 2008-06-30 at 19:23 +1000, Stephen Rothwell wrote:
> This has come up again today. I assume there has been some
> rebasing/modification of the commits involved.
Yeah, I went back and made some fixes in earlier commits. I was about to
do so again, in fact, and rebase onto Linus' current tree while I'm at
it. Is that OK?
--
dwmw2
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: linux-next: manual merge of the firmware tree
2008-06-30 9:27 ` David Woodhouse
@ 2008-06-30 9:32 ` Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2008-06-30 9:32 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Takashi Iwai
[-- Attachment #1: Type: text/plain, Size: 631 bytes --]
Hi David,
On Mon, 30 Jun 2008 10:27:57 +0100 David Woodhouse <dwmw2@infradead•org> wrote:
>
> On Mon, 2008-06-30 at 19:23 +1000, Stephen Rothwell wrote:
> > This has come up again today. I assume there has been some
> > rebasing/modification of the commits involved.
>
> Yeah, I went back and made some fixes in earlier commits. I was about to
> do so again, in fact, and rebase onto Linus' current tree while I'm at
> it. Is that OK?
That's fine, I am just letting you know when things change for me ...
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread
* linux-next: manual merge of the firmware tree
@ 2008-06-24 6:55 Stephen Rothwell
2008-06-24 7:57 ` Stephen Rothwell
0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2008-06-24 6:55 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 520 bytes --]
Hi David,
Today's linux-next merge of the firmware tree got a conflict in
drivers/net/Kconfig between commit
158d7abdae85e9ac43d99780c372d79c119f7626 ("tg3: Add mdio bus
registration") from the tree and commit
b0dc4db2e4d4491ae35c286f1a0a632ee12d5d76 ("firmware: convert tg3 driver
to request_firmware()") from the firmware tree.
Just a case of overlapping additions of SELECTs. I took them both.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the firmware tree
2008-06-24 6:55 Stephen Rothwell
@ 2008-06-24 7:57 ` Stephen Rothwell
2008-06-24 8:04 ` David Woodhouse
0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2008-06-24 7:57 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 457 bytes --]
Hi David,
On Tue, 24 Jun 2008 16:55:08 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the firmware tree got a conflict in
> drivers/net/Kconfig between commit
> 158d7abdae85e9ac43d99780c372d79c119f7626 ("tg3: Add mdio bus
> registration") from the tree and commit
^
"net"
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the firmware tree
2008-06-24 7:57 ` Stephen Rothwell
@ 2008-06-24 8:04 ` David Woodhouse
2008-06-24 11:20 ` Stephen Rothwell
0 siblings, 1 reply; 28+ messages in thread
From: David Woodhouse @ 2008-06-24 8:04 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next
On Tue, 2008-06-24 at 17:57 +1000, Stephen Rothwell wrote:
> Hi David,
>
> On Tue, 24 Jun 2008 16:55:08 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > Today's linux-next merge of the firmware tree got a conflict in
> > drivers/net/Kconfig between commit
> > 158d7abdae85e9ac43d99780c372d79c119f7626 ("tg3: Add mdio bus
> > registration") from the tree and commit
> ^
> "net"
I've been doing nothing about many of these mails, on the assumption
that that's the most useful thing to do.
I can't really merge the net tree into mine and I assume you already
_have_ the fix and a way to make sure it remains applied if you re-pull?
Do let me know if there's something else I could do to make it easier on
your side.
--
dwmw2
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: linux-next: manual merge of the firmware tree
2008-06-24 8:04 ` David Woodhouse
@ 2008-06-24 11:20 ` Stephen Rothwell
0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2008-06-24 11:20 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 1274 bytes --]
Hi David,
On Tue, 24 Jun 2008 09:04:37 +0100 David Woodhouse <dwmw2@infradead•org> wrote:
>
> I've been doing nothing about many of these mails, on the assumption
> that that's the most useful thing to do.
This is the correct response. :-)
Unless the conflict is against Linus' current tree (which happens
sometimes) there is not much you can do as these are merge conflicts
between two trees I am carrying either of which may rebase at any time.
(You could, if it was particularly important, cherrypick particular
commits from other trees, but then you have to worry about updates.)
> I can't really merge the net tree into mine and I assume you already
> _have_ the fix and a way to make sure it remains applied if you re-pull?
Yeah, "git rerere" remembers past merge conflicts and how I fix them.
And when Linus merges you tree, I am sure he will have no more trouble
with the conflicts than I do (if they still exist).
Besides, nearly all these conflicts are very trivial.
> Do let me know if there's something else I could do to make it easier on
> your side.
Rest assured, I will do everything to make my life easier. :-)
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2008-11-29 10:11 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-30 9:09 linux-next: manual merge of the firmware tree Stephen Rothwell
2008-06-30 9:24 ` David Woodhouse
2008-06-30 9:33 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-11-28 5:03 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-09-01 6:19 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-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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox