From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751204AbbCLCun (ORCPT ); Wed, 11 Mar 2015 22:50:43 -0400 Received: from rtits2.realtek.com ([60.250.210.242]:35455 "EHLO rtits2.realtek.com.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751095AbbCLCuj convert rfc822-to-8bit (ORCPT ); Wed, 11 Mar 2015 22:50:39 -0400 Authenticated-By: X-SpamFilter-By: BOX Solutions SpamTrap 5.52 with qID t2C2oI32012152, This message is accepted by code: ctloc85258 From: Bard Liao To: Stephen Rothwell , Mark Brown , Liam Girdwood CC: "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: RE: linux-next: build failure after merge of the sound-asoc tree Thread-Topic: linux-next: build failure after merge of the sound-asoc tree Thread-Index: AQHQWtYgowvWRMGjN0uelem2SOazWp0Xl+4AgACQcSA= Date: Thu, 12 Mar 2015 02:50:18 +0000 Message-ID: References: <20150310130120.38bb6c55@canb.auug.org.au> <20150312131132.3f321cda@canb.auug.org.au> In-Reply-To: <20150312131132.3f321cda@canb.auug.org.au> Accept-Language: zh-TW, en-US Content-Language: zh-TW X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.21.82.147] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > -----Original Message----- > From: Stephen Rothwell [mailto:sfr@canb.auug.org.au] > Sent: Thursday, March 12, 2015 10:12 AM > To: Mark Brown; Liam Girdwood > Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Bard Liao > Subject: Re: linux-next: build failure after merge of the sound-asoc tree > > Hi all, > > On Tue, 10 Mar 2015 13:01:20 +1100 Stephen Rothwell > wrote: > > > > After merging the sound-asoc tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > > > > sound/soc/codecs/rt5670.c: In function 'is_sys_clk_from_pll': > > sound/soc/codecs/rt5670.c:519:38: error: 'struct snd_soc_dapm_widget' > has no member named 'codec' > > struct snd_soc_codec *codec = source->codec; > > ^ > > Hi Please apply Lars-Peter's "ASoC: rt5670: Replace w->codec snd_soc_dapm_to_codec(w->dapm)" patch http://mailman.alsa-project.org/pipermail/alsa-devel/2015-January/086618.html Thanks. > > Caused by commit 485372dc24ca ("ASoC: rt5670: Check sysclk source by > > private data")? > > Still getting this. > > > sound/soc/codecs/rt5670.c: In function 'rt5670_set_dai_sysclk': > > sound/soc/codecs/rt5670.c:2272:1: error: expected expression before > > '<<' token <<<<<<< HEAD ^ > > sound/soc/codecs/rt5670.c:2284:1: error: expected expression before > > '>>' token >>>>>>> v4.0-rc3 ^ > > > > Oops :-( > > This has been fixed. > > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au > > ------Please consider the environment before printing this e-mail.