Hi,
On Mon, Mar 11, 2013 at 08:29:00AM -0700, Greg KH wrote:
> On Mon, Mar 11, 2013 at 01:14:36PM +0200, Felipe Balbi wrote:
> > Hi Greg,
> >
> > Here's my second set of fixes for this -rc cycle. Since my previous pull
> > request didn't reach v3.9-rc2, this one is based out of the previous.
>
> That is fine, due to my travels last week, I didn't get a chance to get
> stuff to Linus. I should catch up this week.
>
> > Surprised to see that git gracefully found a common commit by just running:
> >
> > $ git request-pull greg/usb-linus usb fixes-for-v3.9-rc3
> >
> > (usb is my remote to kernel.org)
> >
> > Anyway, let me know if you have any issues. I have merged this tag on top of
> > your greg/usb-linus branch just to make sure there'd be no conflicts and it
> > merges just fine.
> >
> > cheers
> >
> > The following changes since commit 29240e2392786c39007df2f4162f3dc4680f3dec:
> >
> > usb: gadget: u_uac1: NULL dereference on error path (2013-03-04 13:16:45 +0200)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/fixes-for-v3.9-rc3
>
> Pulled and pushed out, thanks.
hmm... and of course I made a mistake. Forgot to git add one hunk of one
patch, can you take it in patch form ? It's below, but I'll send as a
proper patch as a reply to this mail as well.
8< ------------- cut here ------------------
From 1e7bd9f5130d33a9bd6c005138030ac9ce8bbe7c Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@xxxxxx>
Date: Mon, 11 Mar 2013 19:58:06 +0200
Subject: [PATCH] usb: musb: core: fix possible build error with randconfig
when making commit e574d57 (usb: musb: fix
compile warning) I forgot to git add this
part of the patch which ended up introducing
a possible build error.
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
---
drivers/usb/musb/musb_core.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 13382e0..daec6e0 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1624,8 +1624,6 @@ EXPORT_SYMBOL_GPL(musb_dma_completion);
/*-------------------------------------------------------------------------*/
-#ifdef CONFIG_SYSFS
-
static ssize_t
musb_mode_show(struct device *dev, struct device_attribute *attr, char *buf)
{
@@ -1742,8 +1740,6 @@ static const struct attribute_group musb_attr_group = {
.attrs = musb_attributes,
};
-#endif /* sysfs */
-
/* Only used to provide driver mode change events */
static void musb_irq_work(struct work_struct *data)
{
--
1.8.1.rc1.5.g7e0651a
--
balbi
Attachment:
signature.asc
Description: Digital signature
