On Wed, Oct 09, 2013 at 01:10:47PM -0700, Greg Kroah-Hartman wrote: > On Wed, Oct 09, 2013 at 12:53:51PM -0700, Sarah Sharp wrote: > > From: Sachin Kamat <sachin.kamat@xxxxxxxxxx> > > > > 'xhci_del_comp_mod_timer' is local to this file. > > > > Signed-off-by: Sachin Kamat <sachin.kamat@xxxxxxxxxx> > > Signed-off-by: Sarah Sharp <sarah.a.sharp@xxxxxxxxxxxxxxx> > > --- > > drivers/usb/host/xhci-hub.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c > > index e8b4c56..45ca532 100644 > > --- a/drivers/usb/host/xhci-hub.c > > +++ b/drivers/usb/host/xhci-hub.c > > @@ -524,7 +524,8 @@ static void xhci_hub_report_usb3_link_state(u32 *status, u32 status_reg) > > * the compliance mode timer is deleted. A port won't enter > > * compliance mode if it has previously entered U0. > > */ > > -void xhci_del_comp_mod_timer(struct xhci_hcd *xhci, u32 status, u16 wIndex) > > +static void xhci_del_comp_mod_timer(struct xhci_hcd *xhci, u32 status, > > + u16 wIndex) > > This doesn't need to go into 3.12, as it isn't a bugfix or regression, > as you stated in your pull request, why did you include it? Meh, I thought it was a trivial fix, but you're right, it should go into 3.13. > I can just take these patches individually, instead of as a pull > request, so that this one doesn't come in, is that ok? Sure. I can also send you a second pull request, no biggie. :) Sarah Sharp -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
