From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: Mark Brown <broonie@kernel.org>, Takashi Iwai <tiwai@suse.de>,
Jaroslav Kysela <perex@perex.cz>,
Mac Chiang <mac.chiang@intel.com>
Cc: alsa-devel@alsa-project.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Liam Girdwood <lgirdwood@gmail.com>
Subject: Re: [alsa-devel] Build failure after merge of the sound-current
Date: Tue, 17 Sep 2019 15:56:55 -0500 [thread overview]
Message-ID: <a71b94b7-7692-2f12-8568-488bf845742c@linux.intel.com> (raw)
In-Reply-To: <20190917103858.GA3524@sirena.co.uk>
On 9/17/19 5:38 AM, Mark Brown wrote:
> After merging the sound-current tree, today's linux-next build for x86
> allmodconfig failed like this:
>
> In file included from /home/broonie/next/next/sound/soc/intel/boards/sof_rt5682.c:23:
> /home/broonie/next/next/sound/soc/intel/boards/../common/soc-intel-quirks.h: In function 'soc_intel_is_cml':
> /home/broonie/next/next/sound/soc/intel/boards/../common/soc-intel-quirks.h:39:23: error: 'INTEL_FAM6_KABYLAKE_MOBILE' undeclared (first use in this function); did you mean 'INTEL_FAM6_KABYLAKE_L'?
> SOC_INTEL_IS_CPU(cml, INTEL_FAM6_KABYLAKE_MOBILE);
> caused by commit
>
> c643c189f0fec116 (ASoC: Intel: boards: Add Cometlake machine driver support)
>
> IIRC there was some previous discussion of a dependency on other changes
> here but I thought that was resolved? I've reverted that commit for
> today.
Seems like a conflict with
af239c44e3f97 ('x86/intel: Aggregate big core mobile naming')
maybe we can have a temporary fix in the ASoC tree along the lines of
#ifdef INTEL_FAM6_KABYLAKE_L
#define INTEL_FAM6_KABYLAKE_MOBILE INTEL_FAM6_KABYLAKE_L
#endif
and remove it when the initial patch is in an rc1?
next prev parent reply other threads:[~2019-09-17 20:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-17 10:38 Build failure after merge of the sound-current Mark Brown
2019-09-17 19:57 ` Mark Brown
2019-09-17 20:56 ` Takashi Iwai
2019-09-17 20:56 ` Pierre-Louis Bossart [this message]
2019-09-17 21:02 ` [alsa-devel] " Takashi Iwai
2019-09-17 21:09 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a71b94b7-7692-2f12-8568-488bf845742c@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mac.chiang@intel.com \
--cc=perex@perex.cz \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox