From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.7 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 508B4C4CECE for ; Thu, 17 Oct 2019 07:59:31 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5DD5A214E0 for ; Thu, 17 Oct 2019 07:59:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="DuBf6i4o" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5DD5A214E0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 4EE19844; Thu, 17 Oct 2019 09:58:38 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4EE19844 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1571299168; bh=FG3dRWZ4AZ24/35ITTZpSM4x37zx5j2TvYy7ieLaOQg=; h=Date:From:To:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=DuBf6i4o6x0ZYyE2pzzxesJSy31+j+V4pli+Fa1/9u0WOgUb3YAJeUHQOl6sNnrgj 51HhwLbavE41AvU968j86eE8zh43IZ1stcQije/GznlNmfbmJisRcCYCzjSH1q3T6k oewpgRiaZBhA49NiU8DJk1N6iEpLAGj/5AeOF81c= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id D2C34F802A0; Thu, 17 Oct 2019 09:58:37 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 200ACF804AA; Thu, 17 Oct 2019 09:58:36 +0200 (CEST) Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 01D18F80276 for ; Thu, 17 Oct 2019 09:58:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 01D18F80276 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 0BE11AC6E; Thu, 17 Oct 2019 07:58:33 +0000 (UTC) Date: Thu, 17 Oct 2019 09:58:32 +0200 Message-ID: From: Takashi Iwai To: Kai Vehmanen In-Reply-To: References: <20191011112745.25800-1-kai.vehmanen@linux.intel.com> <20191011112745.25800-6-kai.vehmanen@linux.intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Cc: libin.yang@intel.com, alsa-devel@alsa-project.org, Pierre-Louis Bossart Subject: Re: [alsa-devel] [PATCH v6 5/9] ASoC: SOF: Intel: add support for snd-hda-codec-hdmi X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" On Fri, 11 Oct 2019 16:10:29 +0200, Kai Vehmanen wrote: > > Hey, > > On Fri, 11 Oct 2019, Pierre-Louis Bossart wrote: > > Kai, I get a conflict when I try to apply these patches on Mark's tree? You > > probably want to rebase? > > Or was the intent to go through Takashi's tree? > > I rebased this on top of Takashi's latest before sending: > > 07be92a0e6b0 (tiwai/master) Merge branch 'for-next' > > But yeah, the series will conflict with the DMI patch in Mark's tree: > > 43b2ab9009b1 ASoC: SOF: Intel: hda: Disable DMI L1 entry during capture A trivial conflict can be resolved by either Mark or my side, so don't worry too much about it. But if the patches don't rely on the new stuff that are found only in my tree, maybe it's better to rebase on Mark's tree, so that you can follow the whole other SOF development. thanks, Takashi _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel