Re: [PATCH] usb hubc build fix.patch prefix

[Alan Stern <stern@rowland.harvard.edu>]

On Sun, 1 Oct 2006, Paul Jackson wrote:

> From: Paul Jackson <pj@sgi.com>
> 
> The patch series 2.6.18-mm2-broken-out does not apply to 2.6.18,
> for me anyway.
> 
> The 'quilt push' of this series fails with:
> 
>     Applying patch usb-hubc-build-fix.patch
>     patching file drivers/usb/core/hub.c
>     Hunk #1 FAILED at 1831.
>     Hunk #2 succeeded at 1904 (offset -2 lines).
>     Hunk #3 FAILED at 1946.
>     2 out of 3 hunks FAILED -- rejects in file drivers/usb/core/hub.c
>     Patch usb-hubc-build-fix.patch does not apply (enforce with -f)

There is no patch labelled usb-hubc-build-fix.patch anywhere in 
http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.18/2.6.18-mm2/broken-out/
This suggests that the quilt archive is indeed messed up.

> If I apply the following patch *just before* the failing
> usb-hubc-build-fix.patch, everything applies cleanly from there on
> down the patch set.
> 
> I don't know what's right here.  I'm just blindly pushing code.
> 
> But it seems obvious to me that the 2.6.18-mm2 broken-out patch set
> is borked:
> 
>   The first patch in the series: origin.patch, definitely places these
>   two hub_* defines just before the usb_resume_root_hub() routine.

That is in fact where they belong.  Furthermore, that's where the 
origin.patch file from the URL above puts them.  It sounds like the 
contents of the archive don't match the contents of the directory.

>   But then the patch usb-hubc-build-fix.patch clearly expects to find
>   those two hub_* defines just before the hub_suspend() routine.

That is wrong.  The module won't compile properly when CONFIG_PM is set 
and CONFIG_USB_SUSPEND isn't if the defines are placed there.

Alan Stern

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/