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=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_SANE_1 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 8A844CA9EAF for ; Mon, 21 Oct 2019 13:12:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 639372089C for ; Mon, 21 Oct 2019 13:12:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727256AbfJUNMz (ORCPT ); Mon, 21 Oct 2019 09:12:55 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:35552 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727985AbfJUNMz (ORCPT ); Mon, 21 Oct 2019 09:12:55 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: eballetbo) with ESMTPSA id 65F8728A8BD Subject: Re: [alsa-devel] [PATCH v5 1/4] ASoC: cros_ec_codec: support WoV To: Mark Brown Cc: Tzung-Bi Shih , gwendal@google.com, devicetree@vger.kernel.org, alsa-devel@alsa-project.org, cychiang@google.com, drinkcat@google.com, robh+dt@kernel.org, bleung@google.com, dgreid@google.com References: <20191019070254.23870-1-tzungbi@google.com> <20191019143504.1.I5388b69a7a9c551078fed216a77440cee6dedf49@changeid> <659a3d1f-a8e1-268d-5e95-b328aeed601b@collabora.com> <20191021114303.GC4691@sirena.co.uk> From: Enric Balletbo i Serra Message-ID: Date: Mon, 21 Oct 2019 15:12:50 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20191021114303.GC4691@sirena.co.uk> Content-Type: text/plain; charset=windows-1252 Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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.