* linux-next: sparc/firmware build failure
@ 2008-09-01 9:10 Stephen Rothwell
2008-09-01 9:46 ` David Miller
2008-10-28 10:45 ` Stephen Rothwell
0 siblings, 2 replies; 12+ messages in thread
From: Stephen Rothwell @ 2008-09-01 9:10 UTC (permalink / raw)
To: David Woodhouse, David Miller; +Cc: linux-next, Jaswinder Singh
Hi all,
Today's linux-next build (sparc defconfig) failed like this:
drivers/scsi/qlogicpti.c:478: error: structure has no member named `sdev'
Caused by a combination of commits
5dc2536bb8d8adb5fdfbe76cd6fdcdf9de3f40f8 ("qlogicpti: Convert to pure OF
driver") from the sparc tree and 229d9a03273684dc2175821be4104dbaa52f3ce0
("qlogicpti: use request_firmware") from the firmware tree.
I have applied the following patch. I will carry this patch unless a
better solution comes along.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 1 Sep 2008 18:56:52 +1000
Subject: [PATCH] sparc: qlogicpti fallout from sbus removal
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/scsi/qlogicpti.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index 3d59655..fb9c875 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -475,7 +475,7 @@ static int __devinit qlogicpti_load_firmware(struct qlogicpti *qpti)
unsigned long flags;
int i, timeout;
- err = request_firmware(&fw, fwname, &qpti->sdev->ofdev.dev);
+ err = request_firmware(&fw, fwname, &qpti->op->dev);
if (err) {
printk(KERN_ERR "Failed to load image \"%s\" err %d\n",
fwname, err);
--
1.5.6.5
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: linux-next: sparc/firmware build failure
2008-09-01 9:10 linux-next: sparc/firmware build failure Stephen Rothwell
@ 2008-09-01 9:46 ` David Miller
2008-10-28 10:45 ` Stephen Rothwell
1 sibling, 0 replies; 12+ messages in thread
From: David Miller @ 2008-09-01 9:46 UTC (permalink / raw)
To: sfr; +Cc: dwmw2, linux-next, jaswinder
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 1 Sep 2008 19:10:19 +1000
> I have applied the following patch. I will carry this patch unless a
> better solution comes along.
That patch is the proper way to resolve this merge conflict, please
carry it :-)
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: sparc/firmware build failure
2008-09-01 9:10 linux-next: sparc/firmware build failure Stephen Rothwell
2008-09-01 9:46 ` David Miller
@ 2008-10-28 10:45 ` Stephen Rothwell
2008-10-28 11:42 ` David Woodhouse
1 sibling, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2008-10-28 10:45 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Jaswinder Singh, David Miller
Hi all,
On Mon, 1 Sep 2008 19:10:19 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next build (sparc defconfig) failed like this:
>
> drivers/scsi/qlogicpti.c:478: error: structure has no member named `sdev'
>
> Caused by a combination of commits
> 5dc2536bb8d8adb5fdfbe76cd6fdcdf9de3f40f8 ("qlogicpti: Convert to pure OF
> driver") from the sparc tree and 229d9a03273684dc2175821be4104dbaa52f3ce0
> ("qlogicpti: use request_firmware") from the firmware tree.
>
> I have applied the following patch. I will carry this patch unless a
> better solution comes along.
I have now been carrying this patch since September 1. David (W), are
going to pick it up, please? This should be put into the firmware tree
as part of the merge commit merging Linus' current tree.
Incidentally, what is to be the fate of the rest of the firmware tree?
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 1 Sep 2008 18:56:52 +1000
Subject: [PATCH] sparc: qlogicpti fallout from sbus removal
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/scsi/qlogicpti.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index 3d59655..fb9c875 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -475,7 +475,7 @@ static int __devinit qlogicpti_load_firmware(struct qlogicpti *qpti)
unsigned long flags;
int i, timeout;
- err = request_firmware(&fw, fwname, &qpti->sdev->ofdev.dev);
+ err = request_firmware(&fw, fwname, &qpti->op->dev);
if (err) {
printk(KERN_ERR "Failed to load image \"%s\" err %d\n",
fwname, err);
--
1.5.6.5
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: linux-next: sparc/firmware build failure
2008-10-28 10:45 ` Stephen Rothwell
@ 2008-10-28 11:42 ` David Woodhouse
2008-10-28 12:07 ` Stephen Rothwell
2008-11-03 3:55 ` Stephen Rothwell
0 siblings, 2 replies; 12+ messages in thread
From: David Woodhouse @ 2008-10-28 11:42 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Jaswinder Singh, David Miller
On Tue, 2008-10-28 at 21:45 +1100, Stephen Rothwell wrote:
> I have now been carrying this patch since September 1. David (W), are
> going to pick it up, please? This should be put into the firmware tree
> as part of the merge commit merging Linus' current tree.
I'll merge it; thanks.
> Incidentally, what is to be the fate of the rest of the firmware tree?
We're planning to get the patches in for 2.6.29.
I told Dave that I'd hold off on the network bits until the first round
of patches had been shipped successfully -- so putting them into
2.6.28-rc within _days_ of the 2.6.27 release didn't seem to be the
right thing to do.
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel•com Intel Corporation
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: sparc/firmware build failure
2008-10-28 11:42 ` David Woodhouse
@ 2008-10-28 12:07 ` Stephen Rothwell
2008-11-03 3:55 ` Stephen Rothwell
1 sibling, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2008-10-28 12:07 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Jaswinder Singh, David Miller
[-- Attachment #1: Type: text/plain, Size: 913 bytes --]
Hi David,
On Tue, 28 Oct 2008 11:42:34 +0000 David Woodhouse <dwmw2@infradead•org> wrote:
>
> On Tue, 2008-10-28 at 21:45 +1100, Stephen Rothwell wrote:
> > I have now been carrying this patch since September 1. David (W), are
> > going to pick it up, please? This should be put into the firmware tree
> > as part of the merge commit merging Linus' current tree.
>
> I'll merge it; thanks.
Thanks.
> > Incidentally, what is to be the fate of the rest of the firmware tree?
>
> We're planning to get the patches in for 2.6.29.
OK.
> I told Dave that I'd hold off on the network bits until the first round
> of patches had been shipped successfully -- so putting them into
> 2.6.28-rc within _days_ of the 2.6.27 release didn't seem to be the
> right thing to do.
Yeah.
--
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] 12+ messages in thread
* Re: linux-next: sparc/firmware build failure
2008-10-28 11:42 ` David Woodhouse
2008-10-28 12:07 ` Stephen Rothwell
@ 2008-11-03 3:55 ` Stephen Rothwell
2008-11-05 6:02 ` Stephen Rothwell
1 sibling, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2008-11-03 3:55 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Jaswinder Singh, David Miller
[-- Attachment #1: Type: text/plain, Size: 534 bytes --]
Hi David,
On Tue, 28 Oct 2008 11:42:34 +0000 David Woodhouse <dwmw2@infradead•org> wrote:
>
> On Tue, 2008-10-28 at 21:45 +1100, Stephen Rothwell wrote:
> > I have now been carrying this patch since September 1. David (W), are
> > going to pick it up, please? This should be put into the firmware tree
> > as part of the merge commit merging Linus' current tree.
>
> I'll merge it; thanks.
Still pending ...
--
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] 12+ messages in thread
* Re: linux-next: sparc/firmware build failure
2008-11-03 3:55 ` Stephen Rothwell
@ 2008-11-05 6:02 ` Stephen Rothwell
2008-11-06 2:44 ` Stephen Rothwell
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2008-11-05 6:02 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Jaswinder Singh, David Miller
[-- Attachment #1: Type: text/plain, Size: 794 bytes --]
Hi David,
On Mon, 3 Nov 2008 14:55:42 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> On Tue, 28 Oct 2008 11:42:34 +0000 David Woodhouse <dwmw2@infradead•org> wrote:
> >
> > On Tue, 2008-10-28 at 21:45 +1100, Stephen Rothwell wrote:
> > > I have now been carrying this patch since September 1. David (W), are
> > > going to pick it up, please? This should be put into the firmware tree
> > > as part of the merge commit merging Linus' current tree.
> >
> > I'll merge it; thanks.
>
> Still pending ...
I have reverted commit 229d9a03273684dc2175821be4104dbaa52f3ce0
("qlogicpti: use request_firmware") because the above build fix has not
been applied.
--
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] 12+ messages in thread* Re: linux-next: sparc/firmware build failure
2008-11-05 6:02 ` Stephen Rothwell
@ 2008-11-06 2:44 ` Stephen Rothwell
2008-11-13 3:35 ` Stephen Rothwell
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2008-11-06 2:44 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Jaswinder Singh, David Miller
[-- Attachment #1: Type: text/plain, Size: 413 bytes --]
Hi David,
On Wed, 5 Nov 2008 17:02:56 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> I have reverted commit 229d9a03273684dc2175821be4104dbaa52f3ce0
> ("qlogicpti: use request_firmware") because the above build fix has not
> been applied.
And today I have dropped the firmware 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] 12+ messages in thread* Re: linux-next: sparc/firmware build failure
2008-11-06 2:44 ` Stephen Rothwell
@ 2008-11-13 3:35 ` Stephen Rothwell
2008-11-13 6:57 ` David Miller
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2008-11-13 3:35 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Jaswinder Singh, David Miller
[-- Attachment #1: Type: text/plain, Size: 611 bytes --]
Hi David,
On Thu, 6 Nov 2008 13:44:44 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> On Wed, 5 Nov 2008 17:02:56 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > I have reverted commit 229d9a03273684dc2175821be4104dbaa52f3ce0
> > ("qlogicpti: use request_firmware") because the above build fix has not
> > been applied.
>
> And today I have dropped the firmware tree.
The firmware tree is still dropped. Please do a merge with Linus' tree
and fix the conflicts.
--
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] 12+ messages in thread* Re: linux-next: sparc/firmware build failure
2008-11-13 3:35 ` Stephen Rothwell
@ 2008-11-13 6:57 ` David Miller
2008-11-18 15:37 ` David Woodhouse
0 siblings, 1 reply; 12+ messages in thread
From: David Miller @ 2008-11-13 6:57 UTC (permalink / raw)
To: sfr; +Cc: dwmw2, linux-next, jaswinder
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Thu, 13 Nov 2008 14:35:35 +1100
> On Thu, 6 Nov 2008 13:44:44 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > On Wed, 5 Nov 2008 17:02:56 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> > >
> > > I have reverted commit 229d9a03273684dc2175821be4104dbaa52f3ce0
> > > ("qlogicpti: use request_firmware") because the above build fix has not
> > > been applied.
> >
> > And today I have dropped the firmware tree.
>
> The firmware tree is still dropped. Please do a merge with Linus' tree
> and fix the conflicts.
Yes, pretty please David :-)
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: sparc/firmware build failure
2008-11-13 6:57 ` David Miller
@ 2008-11-18 15:37 ` David Woodhouse
2008-11-18 20:09 ` Stephen Rothwell
0 siblings, 1 reply; 12+ messages in thread
From: David Woodhouse @ 2008-11-18 15:37 UTC (permalink / raw)
To: David Miller; +Cc: sfr, linux-next, jaswinder
On Wed, 2008-11-12 at 22:57 -0800, David Miller wrote:
> > The firmware tree is still dropped. Please do a merge with Linus' tree
> > and fix the conflicts.
>
> Yes, pretty please David :-)
Apologies for the delay. This should be up to date again now.
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel•com Intel Corporation
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: sparc/firmware build failure
2008-11-18 15:37 ` David Woodhouse
@ 2008-11-18 20:09 ` Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2008-11-18 20:09 UTC (permalink / raw)
To: David Woodhouse; +Cc: David Miller, linux-next, jaswinder
[-- Attachment #1: Type: text/plain, Size: 500 bytes --]
Hi David,
On Tue, 18 Nov 2008 15:37:17 +0000 David Woodhouse <dwmw2@infradead•org> wrote:
>
> On Wed, 2008-11-12 at 22:57 -0800, David Miller wrote:
> > > The firmware tree is still dropped. Please do a merge with Linus' tree
> > > and fix the conflicts.
> >
> > Yes, pretty please David :-)
>
> Apologies for the delay. This should be up to date again now.
Thanks for that.
--
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] 12+ messages in thread
end of thread, other threads:[~2008-11-18 20:10 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-01 9:10 linux-next: sparc/firmware build failure Stephen Rothwell
2008-09-01 9:46 ` David Miller
2008-10-28 10:45 ` Stephen Rothwell
2008-10-28 11:42 ` David Woodhouse
2008-10-28 12:07 ` Stephen Rothwell
2008-11-03 3:55 ` Stephen Rothwell
2008-11-05 6:02 ` Stephen Rothwell
2008-11-06 2:44 ` Stephen Rothwell
2008-11-13 3:35 ` Stephen Rothwell
2008-11-13 6:57 ` David Miller
2008-11-18 15:37 ` David Woodhouse
2008-11-18 20:09 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox