From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Brown Subject: Re: linux-next: build failure after merge of the sound tree (Was: Re: linux-next: build failure after merge of the sound-asoc tree) Date: Sun, 26 Dec 2010 23:59:29 +0000 Message-ID: <20101226235928.GA18334@opensource.wolfsonmicro.com> References: <20101223120243.1617cd40.sfr@canb.auug.org.au> <20101223021212.GA25886@opensource.wolfsonmicro.com> <20101227104951.1ecad371.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from opensource.wolfsonmicro.com ([80.75.67.52]:36788 "EHLO opensource2.wolfsonmicro.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752748Ab0LZX7b (ORCPT ); Sun, 26 Dec 2010 18:59:31 -0500 Content-Disposition: inline In-Reply-To: <20101227104951.1ecad371.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Takashi Iwai , Liam Girdwood , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org On Mon, Dec 27, 2010 at 10:49:51AM +1100, Stephen Rothwell wrote: > On Thu, 23 Dec 2010 02:12:12 +0000 Mark Brown wrote: > > above which can't build on x86 as x86 lacks generic hardirqs. I've > > pushed up a change which ifdefs out all the tracepoints when things are > > built modular, but it seems unfortunate that x86 isn't doing the right > > thing here, whatever ARM is doing seems to DTRT. > The first of those errors is now present in the sound tree, so I have > used the version of the sound tree that would have been in next-20101223 > if I had released it. Hrm? I thought you merged the ASoC tree before the sound tree, in which case the above is somehwat surprising. If the ASoC tree merged OK then Takashi it should be a simple case of pulling my for-2.6.38 branch to resolve the issue.