From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
To: Mark Brown <broonie@kernel.org>
Cc: gwendal@google.com, drinkcat@google.com,
alsa-devel@alsa-project.org, cychiang@google.com,
devicetree@vger.kernel.org, Tzung-Bi Shih <tzungbi@google.com>,
robh+dt@kernel.org, bleung@google.com, dgreid@google.com
Subject: Re: [alsa-devel] [PATCH v5 1/4] ASoC: cros_ec_codec: support WoV
Date: Mon, 21 Oct 2019 15:12:50 +0200 [thread overview]
Message-ID: <a4e1530a-b706-2a73-e0b3-ad56cf9085bc@collabora.com> (raw)
In-Reply-To: <20191021114303.GC4691@sirena.co.uk>
Hi,
On 21/10/19 13:43, Mark Brown wrote:
> On Mon, Oct 21, 2019 at 01:26:04PM +0200, Enric Balletbo i Serra wrote:
>
>> Mark, once applied, could we get an immutable branch from you containing the
>> following already applied patches + this series? We need as we have patches that
>> could conflict on platform/chrome.
>
> Ugh. You should have mentioned this before the patches were applied,
> they're on the development branch that has everything in it like I
> normally do which I don't want to rebase (and I think I did a merge up
> of the fixes branch since then anyway). Hopefully Linus will be able to
> figure out any conflicts that occur.
>
Ok, I was off the latest two weeks so I didn't catch it :-(. I'll try to figure
out the better way to avoid conflicts knowing that these are already queued.
Thanks,
Enric.
_______________________________________________
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-21 13:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-19 7:02 [alsa-devel] [PATCH v5 0/4] ASoC: mediatek: mt8183-mt6358-ts3a227-max98357: support WoV Tzung-Bi Shih
2019-10-19 7:02 ` [alsa-devel] [PATCH v5 1/4] ASoC: cros_ec_codec: " Tzung-Bi Shih
2019-10-21 11:26 ` Enric Balletbo i Serra
2019-10-21 11:43 ` Mark Brown
2019-10-21 13:12 ` Enric Balletbo i Serra [this message]
2019-10-21 13:50 ` Mark Brown
2019-10-21 18:00 ` [alsa-devel] Applied "ASoC: cros_ec_codec: support WoV" to the asoc tree Mark Brown
2019-10-19 7:02 ` [alsa-devel] [PATCH v5 2/4] ASoC: mediatek: mt6358: support WoV Tzung-Bi Shih
2019-10-21 18:00 ` [alsa-devel] Applied "ASoC: mediatek: mt6358: support WoV" to the asoc tree Mark Brown
2019-10-19 7:02 ` [alsa-devel] [PATCH v5 3/4] ASoC: dt-bindings: mt8183: add ec-codec Tzung-Bi Shih
2019-10-21 18:00 ` [alsa-devel] Applied "ASoC: dt-bindings: mt8183: add ec-codec" to the asoc tree Mark Brown
2019-10-19 7:02 ` [alsa-devel] [PATCH v5 4/4] ASoC: mediatek: mt8183: support WoV Tzung-Bi Shih
2019-10-21 18:00 ` [alsa-devel] Applied "ASoC: mediatek: mt8183: support WoV" to the asoc tree 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=a4e1530a-b706-2a73-e0b3-ad56cf9085bc@collabora.com \
--to=enric.balletbo@collabora.com \
--cc=alsa-devel@alsa-project.org \
--cc=bleung@google.com \
--cc=broonie@kernel.org \
--cc=cychiang@google.com \
--cc=devicetree@vger.kernel.org \
--cc=dgreid@google.com \
--cc=drinkcat@google.com \
--cc=gwendal@google.com \
--cc=robh+dt@kernel.org \
--cc=tzungbi@google.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