From: Takashi Iwai <tiwai@suse.de>
To: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Cc: libin.yang@intel.com, alsa-devel@alsa-project.org,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: Re: [alsa-devel] [PATCH v6 5/9] ASoC: SOF: Intel: add support for snd-hda-codec-hdmi
Date: Thu, 17 Oct 2019 09:58:32 +0200 [thread overview]
Message-ID: <s5hmudziz13.wl-tiwai@suse.de> (raw)
In-Reply-To: <alpine.DEB.2.21.1910111705060.16459@zeliteleevi>
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
next prev parent reply other threads:[~2019-10-17 7:59 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-11 11:27 [alsa-devel] [PATCH v6 0/9] adapt SOF to use snd-hda-codec-hdmi Kai Vehmanen
2019-10-11 11:27 ` [alsa-devel] [PATCH v6 1/9] ALSA: hda/hdmi - implement mst_no_extra_pcms flag Kai Vehmanen
2019-10-11 11:27 ` [alsa-devel] [PATCH v6 2/9] ASoC: hdac_hda: add support for HDMI/DP as a HDA codec Kai Vehmanen
2019-10-11 11:27 ` [alsa-devel] [PATCH v6 3/9] ASoC: Intel: skl-hda-dsp-generic: use snd-hda-codec-hdmi Kai Vehmanen
2019-10-17 8:06 ` Takashi Iwai
2019-10-22 11:15 ` Kai Vehmanen
2019-10-11 11:27 ` [alsa-devel] [PATCH v6 4/9] ASoC: Intel: skl-hda-dsp-generic: fix include guard name Kai Vehmanen
2019-10-11 11:27 ` [alsa-devel] [PATCH v6 5/9] ASoC: SOF: Intel: add support for snd-hda-codec-hdmi Kai Vehmanen
2019-10-11 14:00 ` Pierre-Louis Bossart
2019-10-11 14:10 ` Kai Vehmanen
2019-10-17 7:58 ` Takashi Iwai [this message]
2019-10-17 13:20 ` Pierre-Louis Bossart
2019-10-22 11:19 ` Kai Vehmanen
2019-10-22 13:17 ` Pierre-Louis Bossart
2019-10-11 11:27 ` [alsa-devel] [PATCH v6 6/9] ASoC: Intel: bxt-da7219-max98357a: common hdmi codec support Kai Vehmanen
2019-10-11 11:27 ` [alsa-devel] [PATCH v6 7/9] ASoC: Intel: glk_rt5682_max98357a: " Kai Vehmanen
2019-10-11 11:27 ` [alsa-devel] [PATCH v6 8/9] ASoC: intel: sof_rt5682: " Kai Vehmanen
2019-10-11 11:27 ` [alsa-devel] [PATCH v6 9/9] ASoC: Intel: bxt_rt298: " Kai Vehmanen
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=s5hmudziz13.wl-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=kai.vehmanen@linux.intel.com \
--cc=libin.yang@intel.com \
--cc=pierre-louis.bossart@linux.intel.com \
/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