From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: linux-next: build failure after merge of the usb tree Date: Tue, 14 Sep 2010 06:26:40 -0700 Message-ID: <20100914132640.GB499@kroah.com> References: <20100914125431.1603ffd1.sfr@canb.auug.org.au> <20100914040803.GB11972@kroah.com> <20100914142528.1810936b.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20100914142528.1810936b.sfr@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Mihai Don??u , David Brownell List-Id: linux-next.vger.kernel.org On Tue, Sep 14, 2010 at 02:25:28PM +1000, Stephen Rothwell wrote: > Hi Greg, > > On Mon, 13 Sep 2010 21:08:03 -0700 Greg KH wrote: > > > > On Tue, Sep 14, 2010 at 12:54:31PM +1000, Stephen Rothwell wrote: > > > Hi Greg, > > > > > > After merging the usb tree, today's linux-next build (x86_64 allmodconfig) > > > failed like this: > > > > > > In file included from drivers/usb/gadget/ether.c:123: > > > drivers/usb/gadget/rndis.c: In function 'rndis_init': > > > drivers/usb/gadget/rndis.c:1163: error: expected ';' before 'if' > > > > > > Caused by commit c8feb3bad134f927a624cc19da13f57627b905e2 ("USB: gadget: > > > rndis: fix up coding style issues in the file"). > > > > > > I used the version of the usb tree from next-20100913 for today. > > > > I can't duplicate this at all, are you sure it's coming from my tree? > > What is your .config here? > > See above: that was an x86_64 allmodconfig build. You need > CONFIG_USB_GADGET_DEBUG_FILES set. > > The patch above was not in your usb quilt series when I fetched it > yesterday and it was there this morning. The relevant hunk of the patch > looks like this: > > @@ -1160,42 +1158,40 @@ int rndis_init(void) > #ifdef CONFIG_USB_GADGET_DEBUG_FILES > char name [20]; > > - sprintf (name, NAME_TEMPLATE, i); > - if (!(rndis_connect_state [i] > - = proc_create_data(name, 0660, NULL, > + sprintf(name, NAME_TEMPLATE, i); > + rndis_connect_state[i] = proc_create_data(name, 0660, NULL, > &rndis_proc_fops, > - (void *)(rndis_per_dev_params + i)))) > - { > - pr_debug("%s :remove entries", __func__); > + (void *)(rndis_per_dev_params + i)) > ^ > *** note missing semicolon ... Doh, now I got it, sorry, I didn't have that config option enabled. I've now fixed this. greg k-h