Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754228Ab0L0Pid (ORCPT ); Mon, 27 Dec 2010 10:38:33 -0500 Received: from opensource.wolfsonmicro.com ([80.75.67.52]:36608 "EHLO opensource2.wolfsonmicro.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754197Ab0L0Pic (ORCPT ); Mon, 27 Dec 2010 10:38:32 -0500 Date: Mon, 27 Dec 2010 15:38:43 +0000 From: Mark Brown To: Stephen Rothwell Cc: linux-next@vger.kernel.org, LKML Subject: Re: linux-next: Tree for December 27 Message-ID: <20101227153843.GA13400@opensource.wolfsonmicro.com> References: <20101227170451.a9a9f873.sfr@canb.auug.org.au> <20101227113857.GA31293@sirena.org.uk> <20101228022027.8519be82.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20101228022027.8519be82.sfr@canb.auug.org.au> X-Cookie: Your domestic life may be harmonious. User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1274 Lines: 28 On Tue, Dec 28, 2010 at 02:20:27AM +1100, Stephen Rothwell wrote: > I got this error after merging the sound tree: > ERROR: "__tracepoint_snd_soc_jack_irq" [sound/soc/codecs/snd-soc-wm8962.ko] undefined! > after that, I merged the old version of the sound tree. I then merged > the sound-asoc tree and go the same error. I presumed that you had fixed > the other error: > ERROR: "__tracepoint_snd_soc_jack_irq" [sound/soc/codecs/snd-soc-wm8903.ko] undefined! > in the sound-asoc tree and then that version of the sound-asoc tree had > been merged into the sound tree. To my knowledge I'd fixed everything. However, it looks like there's a typo in the wm8962 ifdef to work around the x86 failure which was causing the problem; since you hadn't mentioned that you'd encountered any issue after I'd done the previous fix I'd no idea that this had happened and it had appeared that the problem with Takashi's tree was simply that he'd not merged up the fix. Fixed now, anyway. Please do report if you see any more issues. -- 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/