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=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 DD672C43441 for ; Mon, 26 Nov 2018 11:26:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A6FB320672 for ; Mon, 26 Nov 2018 11:26:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A6FB320672 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=ti.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727250AbeKZWTz (ORCPT ); Mon, 26 Nov 2018 17:19:55 -0500 Received: from fllv0016.ext.ti.com ([198.47.19.142]:41210 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726263AbeKZWTz (ORCPT ); Mon, 26 Nov 2018 17:19:55 -0500 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id wAQBPZSq029834; Mon, 26 Nov 2018 05:25:35 -0600 Received: from DFLE113.ent.ti.com (dfle113.ent.ti.com [10.64.6.34]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id wAQBPZOw037018 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 26 Nov 2018 05:25:35 -0600 Received: from DFLE103.ent.ti.com (10.64.6.24) by DFLE113.ent.ti.com (10.64.6.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Mon, 26 Nov 2018 05:25:35 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1591.10 via Frontend Transport; Mon, 26 Nov 2018 05:25:35 -0600 Received: from [172.24.190.172] (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id wAQBPWUV005519; Mon, 26 Nov 2018 05:25:32 -0600 Subject: Re: [RFC 0/9] ASoC/ARM: Merge the davinci and omap audio directories To: Tony Lindgren , Peter Ujfalusi CC: Mark Brown , Liam Girdwood , , , , , , References: <20181108083754.1746-1-peter.ujfalusi@ti.com> <20181108151628.GH56134@atomide.com> From: Sekhar Nori Message-ID: <808d350d-9e0e-d9b5-a474-1a4fd0c9b292@ti.com> Date: Mon, 26 Nov 2018 16:55:31 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: <20181108151628.GH56134@atomide.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 08/11/18 8:46 PM, Tony Lindgren wrote: > * Peter Ujfalusi [181108 08:36]: >> I believe with v1 all of this can be merged via ASoC tree as the chances of >> conflicts are low for the touched arch/arm files. But Sekhar and Tony can >> correct me if I'm wrong. > > Good to see this :) Yes merging these changes via the ASoC tree makes > sense to me. I will take a look and ack when you post the version > without RFC. Looks good to me too. And fine with the series getting merged through ASoC. But will appreciate an immutable commit over v4.20-rc1 in case I do end up queuing something that clashes with changes here (especially worried about the defconfig changes - those are notorious for merge conflicts, and are pain to resolve). I will test this once the non-RFC version is posted. Thanks, Sekhar