Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759785Ab3D2VO2 (ORCPT ); Mon, 29 Apr 2013 17:14:28 -0400 Received: from iolanthe.rowland.org ([192.131.102.54]:55565 "HELO iolanthe.rowland.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1759532Ab3D2VO1 (ORCPT ); Mon, 29 Apr 2013 17:14:27 -0400 Date: Mon, 29 Apr 2013 17:14:26 -0400 (EDT) From: Alan Stern X-X-Sender: stern@iolanthe.rowland.org To: Linus Torvalds cc: Greg KH , Andrew Morton , Linux Kernel Mailing List , USB list Subject: Re: [GIT PATCH] USB patches for 3.10-rc1 In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1793 Lines: 45 On Mon, 29 Apr 2013, Linus Torvalds wrote: > On Mon, Apr 29, 2013 at 9:23 AM, Greg KH 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/