Re: [GIT PATCH] USB patches for 3.10-rc1

[Alan Stern]

On Mon, 29 Apr 2013, Linus Torvalds wrote:

> On Mon, Apr 29, 2013 at 9:23 AM, Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
> >
> >   git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git/ tags/usb-3.10-rc1
> 
> This has some odd things in it, but I made the mistake of pushing out
> my merge before I noticed, so it's out there now regardless.
> 
> See here: commit 84ebc10294a3 ("USB: remove CONFIG_USB_SUSPEND
> option") claims to remove the USB_SUSPEND config option, but doesn't
> actually do so.
> 
> And no, it's not my merge that is in error, although there may be
> merge errors in addition to the oddities I've found. Doing a
> 
>    git grep -w USB_SUSPEND 84ebc10294a3
> 
> shows that there remains things that have "depends on .. USB_SUSPEND"
> even in the very commit that claims to remove the option. Later
> commits then move them around (eg the whole drivers/usb/otg ->
> drivers/usb/phy movement), but the USB_SUSPEND stays around.

Strange.  I was quite sure at the time that I had removed all traces of
USB_SUSPEND, but clearly that was wrong.

Anyway, I'll send in a patch to remove the remaining usages.  Many of
them are in comments, but some are in Kconfig files where they will
really matter.

> Hmm? I'm assuming you applied a patch without noticing that in the
> meantime other users of USB_SUSPEND had grow up?

Or they survived in some other manner.  It's possible that I edited
these files but then failed to include them in the final patch.

What other things seemed odd about Greg's pull request?

Alan Stern

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