Skip to contentSkip to conversation

musb: fix DaVinci build again

PATCH Sergei Shtylyov 3 participants 8 messages Dec 23, 2008 – Dec 25, 2008 4 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): [email protected]

#4 lore raw
Quoted 17 lines · Sergei Shtylyov
Quoted 15 lines · Hello, I wrote:
Quoted 8 lines
Quoted 5 lines

The last Kevin Hilman's patch seems to have been broken on its way to Greg's tree and also probably clashed with yet another patch. Fix DaVinci build again.

---
Felipe, I have to ask you again to be more careful with patches...

11 days have passed since this has benn sent out and I'm still
not seeing this 2.6.28 *hot* fix in the MUSB git tree. Greg, could you queue this urgently, bypassing the MUSB tree?

I'll be happy if it gets combined with the following patch in your
tree:

http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/usb/usb-musb-build-fixes-for-davinci.patch

Quoted 6 lines
Quoted 1 line

fallout of which I'm fixing. Though it would've been better yet if you just dropped that totally broken patch. I could've send a replacment then...

The patch I liked to above fixes nothing and only adds more
breakage. Compare it with the original Kevin's patch:

http://marc.info/?l=linux-usb&m=122608723815504

I'm seeing Felipe returning to the list but still ignoring this
thread so far.
For how much longer we'll have to wait for this issue to be resolved?
2.6.28 is 2 days away (at most).
Greg, what's the problem with dropping obviously broken patch?

WBR, Sergei

#5 lore raw
Quoted 2 lines · Sergei Shtylyov

   For how much longer we'll have to wait for this issue to be resolved? 2.6.28 is 2 days away (at most).

Yeah, I sent a DaVinci build fix patch in plenty of time to be merged for *2.6.27* (!!!!) but still the key parts are missing, and have not managed to make it into mainline.

#6 lore raw

Hello.

Quoted 7 lines · David Brownell
Quoted 3 lines

For how much longer we'll have to wait for this issue to be resolved?
2.6.28 is 2 days away (at most).

Yeah, I sent a DaVinci build fix patch in plenty of time to be merged for *2.6.27* (!!!!) but still the key parts are missing, and have not managed to make it into mainline.

Try breakinjg the patches into smaller pieces next time, so they may
get thru the maintainer's sieve more easily. :-)

WBR, Sergei

#7 lore raw
Quoted 6 lines · Sergei Shtylyov
Quoted 3 lines

Yeah, I sent a DaVinci build fix patch in plenty of time to be merged for *2.6.27* (!!!!) but still the key parts are missing, and have not managed to make it into mainline.

Try breakinjg the patches into smaller pieces next time, so they may
get thru the maintainer's sieve more easily. :-)

That wasn't the issue back then. If you look at

c767c1c6f1febbd1351cc152bba6e37889322d17

which got merged after 2.6.27 shipped, you'll notice that someone stripped out the following parts from the original patch, which were even referenced in the patch comment.

This worked as submitted, but then got broken during merge; and fixes have been re-sent several times already.

Plus, some other stuff has merged which prevents linking. Fixes for those parts have been re-sent several times too.

- Dave

============= CUT HERE
From: David Brownell <[email protected]>

Build fixes that somehow got stripped out of the earlier build fix patch ...

---
 drivers/usb/musb/davinci.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/usb/musb/davinci.c +4 -3
@@ -31,10 +31,11 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
+#include <linux/gpio.h>
+
+#include <mach/hardware.h>
+#include <mach/memory.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/memory.h>
-#include <asm/arch/gpio.h>
 #include <asm/mach-types.h>
 
 #include "musb_core.h"
#8 lore raw

Hi,

just a note before a comment. I'm gonna be on vacations during this and next week. Trying to get better from a really terrible flu so I won't be hacking too much during this time.

Anyways, once comment below.

Quoted 13 lines · David Brownell

From: David Brownell <[email protected]>

Build fixes that somehow got stripped out of the earlier build fix patch ...

---
 drivers/usb/musb/davinci.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

drivers/usb/musb/davinci.c line 34

Quoted 4 lines
drivers/usb/musb/davinci.c +1 -0
@@ -31,10 +31,11 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
+#include <linux/gpio.h>

you're including <linux/gpio.h> twice.

Signature · 1 line
balbi
#9 lore raw
Quoted 4 lines · Felipe Balbi
Quoted 2 lines

 #include <linux/gpio.h>
+#include <linux/gpio.h>

you're including <linux/gpio.h> twice.

Yeah, I suppose I just edited the patch to delete segments that *did* get merged. It looks like that change to <linux/gpio.h> got included, and "patch" didn't complain ... leaving the puzzle of just why the *rest* of that pre-2.6.27 build fix still hasn't merged.

A double inclusion is a minor-but-harmless annoyance. Those <asm/arch/...> ==> <mach/...> header changes were mostly merged by 2.6.27-rc2, but ones for this particular file got stripped out. More than a small bit puzzling; I can understand patches getting dropped or lost, but not getting mangled like that.

When I verify that I have a kernel booting on the DM6446 EVM in mainline, I'll resend both of the patches. They are IMO overdue to merge.

#10 lore raw

Greg, I suggest you just use the appended patch to *REPLACE* the patch now in your gregkh-04-usb queue:

usb-musb-build-fixes-for-davinci.patch

Net effect of including this plus the other patches in that queue is to achieve what the original 2.6.27-rc(3?) build fix patch would have done, if it were merged right.

- Dave

===========
From: Kevin Hilman <[email protected]>

- update includes after asm/arch --> mach headers move

[ [email protected]: just fix mismerge of my 2.6.27-rc patch ]

---
 drivers/usb/musb/davinci.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/usb/musb/davinci.c +3 -3
@@ -32,9 +32,9 @@
 #include <linux/io.h>
 #include <linux/gpio.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/memory.h>
-#include <asm/arch/gpio.h>
+#include <mach/hardware.h>
+#include <mach/memory.h>
+
 #include <asm/mach-types.h>
 
 #include "musb_core.h"
#11 lore raw
In reply to Sergei Shtylyov
Quoted 19 lines · Hello, I wrote:
Quoted 18 lines
Quoted 9 lines
Quoted 8 lines
Quoted 5 lines

The last Kevin Hilman's patch seems to have been broken on its way to Greg's tree and also probably clashed with yet another patch. Fix DaVinci build again.

---
Felipe, I have to ask you again to be more careful with patches...

11 days have passed since this has benn sent out and I'm still
not seeing this 2.6.28 *hot* fix in the MUSB git tree. Greg, could you queue this urgently, bypassing the MUSB tree?

Quoted 6 lines

I'll be happy if it gets combined with the following patch in your
tree:

http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/usb/usb-musb-build-fixes-for-davinci.patch

fallout of which I'm fixing. Though it would've been better yet if you just dropped that totally broken patch. I could've send a replacment then...

The patch I liked to above fixes nothing and only adds more
breakage. Compare it with the original Kevin's patch:

Quoted 7 lines
Quoted 1 line

http://marc.info/?l=linux-usb&m=122608723815504

I'm seeing Felipe returning to the list but still ignoring this thread
so far.
For how much longer we'll have to wait for this issue to be resolved?
2.6.28 is 2 days away (at most).
Greg, what's the problem with dropping obviously broken patch?

Greg, looks like that *2.6.28* (acyually even 2.6.27) patch is even in the
wrong sub-series (past-2.6.28) of your tree, so there was no hope on the timely resolution from the very start... sigh. :-(

WBR, Sergei