From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753371Ab0IWGEr (ORCPT ); Thu, 23 Sep 2010 02:04:47 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45086 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753329Ab0IWGEq (ORCPT ); Thu, 23 Sep 2010 02:04:46 -0400 Date: Thu, 23 Sep 2010 08:04:45 +0200 Message-ID: From: Takashi Iwai To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Brown , Liam Girdwood Subject: Re: linux-next: build failure after merge of the sound tree In-Reply-To: <20100923124445.a2b5de42.sfr@canb.auug.org.au> References: <20100923124445.a2b5de42.sfr@canb.auug.org.au> User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.1 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At Thu, 23 Sep 2010 12:44:45 +1000, Stephen Rothwell wrote: > > Hi Takashi, > > After merging the sound tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > sound/soc/soc-cache.c: In function 'snd_soc_8_16_write': > sound/soc/soc-cache.c:207: error: 'struct snd_soc_codec' has no member named 'reg_cache_size' > > Caused by commit 0077ca0b5c986477e33451b797b6e7dc92a8bbc0 ("ASoC: Fix > multi-componentism") which looks like it was fixing something that didn't > need fixing (or maybe fixed it incorrectly)? This commit is not in the > sound-asoc tree (but the commit it purports to be fixing is in both the > sound and sound-asoc trees) ... > Ah, this was a quick fix for 2.6.36, but it needs to be reverted again for 2.6.37. for-next branch contains 2.6.37 patches, thus it got broken. I fixed now. Mark, could you pull topic/asoc branch on my tree? Sorry for inconvenience. Takashi