* Re: [PATCH] musb: fix DaVinci build again [not found] ` <494E2450.9080601@ru.mvista.com> @ 2008-12-23 11:46 ` Sergei Shtylyov 2008-12-23 17:38 ` David Brownell 2008-12-24 15:04 ` Sergei Shtylyov 0 siblings, 2 replies; 8+ messages in thread From: Sergei Shtylyov @ 2008-12-23 11:46 UTC (permalink / raw) To: gregkh Cc: felipe.balbi, linux-usb, khilman, davinci-linux-open-source, david-b, linux-kernel Sergei Shtylyov wrote: > Hello, I wrote: > >>>> 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. >>>> Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> >>>> --- >>>> 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 >> >> >> 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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] musb: fix DaVinci build again 2008-12-23 11:46 ` [PATCH] musb: fix DaVinci build again Sergei Shtylyov @ 2008-12-23 17:38 ` David Brownell 2008-12-23 23:23 ` Sergei Shtylyov 2008-12-24 15:04 ` Sergei Shtylyov 1 sibling, 1 reply; 8+ messages in thread From: David Brownell @ 2008-12-23 17:38 UTC (permalink / raw) To: Sergei Shtylyov, gregkh, felipe.balbi Cc: linux-usb, khilman, davinci-linux-open-source, linux-kernel On Tuesday 23 December 2008, Sergei Shtylyov wrote: > 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. ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] musb: fix DaVinci build again 2008-12-23 17:38 ` David Brownell @ 2008-12-23 23:23 ` Sergei Shtylyov 2008-12-24 1:07 ` David Brownell 0 siblings, 1 reply; 8+ messages in thread From: Sergei Shtylyov @ 2008-12-23 23:23 UTC (permalink / raw) To: David Brownell Cc: gregkh, felipe.balbi, linux-usb, khilman, davinci-linux-open-source, linux-kernel Hello. David Brownell wrote: >> 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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] musb: fix DaVinci build again 2008-12-23 23:23 ` Sergei Shtylyov @ 2008-12-24 1:07 ` David Brownell 2008-12-24 2:27 ` Felipe Balbi 0 siblings, 1 reply; 8+ messages in thread From: David Brownell @ 2008-12-24 1:07 UTC (permalink / raw) To: Sergei Shtylyov, gregkh, felipe.balbi Cc: linux-usb, khilman, davinci-linux-open-source, linux-kernel On Tuesday 23 December 2008, Sergei Shtylyov wrote: > > 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 <dbrownell@users.sourceforge.net> Build fixes that somehow got stripped out of the earlier build fix patch ... Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> --- drivers/usb/musb/davinci.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c @@ -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" ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] musb: fix DaVinci build again 2008-12-24 1:07 ` David Brownell @ 2008-12-24 2:27 ` Felipe Balbi 2008-12-24 3:52 ` David Brownell 0 siblings, 1 reply; 8+ messages in thread From: Felipe Balbi @ 2008-12-24 2:27 UTC (permalink / raw) To: David Brownell Cc: Sergei Shtylyov, gregkh, felipe.balbi, davinci-linux-open-source, linux-usb, linux-kernel 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. On Tue, Dec 23, 2008 at 05:07:47PM -0800, David Brownell wrote: > From: David Brownell <dbrownell@users.sourceforge.net> > > Build fixes that somehow got stripped out of the earlier build > fix patch ... > > Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> > --- > drivers/usb/musb/davinci.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > --- a/drivers/usb/musb/davinci.c > +++ b/drivers/usb/musb/davinci.c > @@ -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. -- balbi ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] musb: fix DaVinci build again 2008-12-24 2:27 ` Felipe Balbi @ 2008-12-24 3:52 ` David Brownell 2008-12-25 20:37 ` David Brownell 0 siblings, 1 reply; 8+ messages in thread From: David Brownell @ 2008-12-24 3:52 UTC (permalink / raw) To: me Cc: Sergei Shtylyov, gregkh, felipe.balbi, davinci-linux-open-source, linux-usb, linux-kernel On Tuesday 23 December 2008, Felipe Balbi wrote: > > #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. ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] musb: fix DaVinci build again 2008-12-24 3:52 ` David Brownell @ 2008-12-25 20:37 ` David Brownell 0 siblings, 0 replies; 8+ messages in thread From: David Brownell @ 2008-12-25 20:37 UTC (permalink / raw) To: gregkh Cc: davinci-linux-open-source, me, linux-usb, felipe.balbi, linux-kernel, Kevin Hilman 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 <khilman@deeprootsystems.com> - update includes after asm/arch --> mach headers move [ dbrownell@users.sourceforge.net: just fix mismerge of my 2.6.27-rc patch ] Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/usb/musb/davinci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c @@ -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" ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] musb: fix DaVinci build again 2008-12-23 11:46 ` [PATCH] musb: fix DaVinci build again Sergei Shtylyov 2008-12-23 17:38 ` David Brownell @ 2008-12-24 15:04 ` Sergei Shtylyov 1 sibling, 0 replies; 8+ messages in thread From: Sergei Shtylyov @ 2008-12-24 15:04 UTC (permalink / raw) To: gregkh Cc: felipe.balbi, linux-usb, khilman, davinci-linux-open-source, david-b, linux-kernel Hello, I wrote: >>>>> 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. >>>>> Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> >>>>> --- >>>>> 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 >>> 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? 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 ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2008-12-25 20:37 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <200812072341.50012.sshtylyov@ru.mvista.com> [not found] ` <494A7729.6090102@ru.mvista.com> [not found] ` <494A7809.1040504@ru.mvista.com> [not found] ` <494E2450.9080601@ru.mvista.com> 2008-12-23 11:46 ` [PATCH] musb: fix DaVinci build again Sergei Shtylyov 2008-12-23 17:38 ` David Brownell 2008-12-23 23:23 ` Sergei Shtylyov 2008-12-24 1:07 ` David Brownell 2008-12-24 2:27 ` Felipe Balbi 2008-12-24 3:52 ` David Brownell 2008-12-25 20:37 ` David Brownell 2008-12-24 15:04 ` Sergei Shtylyov
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.