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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_PASS,T_DKIMWL_WL_HIGH,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 1CC33C433F4 for ; Tue, 28 Aug 2018 22:51:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CA76F2087A for ; Tue, 28 Aug 2018 22:51:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="g3iAiFMv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CA76F2087A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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 S1727874AbeH2CpX (ORCPT ); Tue, 28 Aug 2018 22:45:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:42968 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727366AbeH2CpX (ORCPT ); Tue, 28 Aug 2018 22:45:23 -0400 Received: from localhost (unknown [104.132.0.94]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7B3CC2087D; Tue, 28 Aug 2018 22:51:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1535496693; bh=piH8im1w33hixSPmKgSaopKUQBlBdtHYXoP1OadVkFk=; h=To:From:In-Reply-To:Cc:References:Subject:Date:From; b=g3iAiFMvwqsCL1g/4a1bx1FbStefw6nBUo3Gly6ydBRDZQFtNZPfckb8n1FHzrJOZ Yr6Lli3KrCeNLoUQDPCbeyWw/+9SPsLFQOGUOkNrbCiTaRO8H/59Ft5MGrgCtzzbrX wvpdgJl01skWHgeL1Cmg5fqd+dCw4OornvwSXtiw= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: Bjorn Andersson From: Stephen Boyd In-Reply-To: <20180813184351.GG23866@tuxbook-pro> Cc: Andy Gross , David Brown , Mark Rutland , Michael Turquette , Rob Herring , Rajendra Nayak , linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org References: <20180809220119.18932-1-bjorn.andersson@linaro.org> <153391387168.37448.10798348572941173469@swboyd.mtv.corp.google.com> <20180813184351.GG23866@tuxbook-pro> Message-ID: <153549669279.129321.14626645105795361106@swboyd.mtv.corp.google.com> User-Agent: alot/0.7 Subject: Re: [PATCH v2] clk: qcom: Add some missing gcc clks for msm8996 Date: Tue, 28 Aug 2018 15:51:32 -0700 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Quoting Bjorn Andersson (2018-08-13 11:43:51) > On Fri 10 Aug 08:11 PDT 2018, Stephen Boyd wrote: > = > > Quoting Bjorn Andersson (2018-08-09 15:01:19) > > > From: Rajendra Nayak > > > = > > > Add a few missing gcc clks for msm8996 > > > = > > > Signed-off-by: Rajendra Nayak > > > [bjorn: omit aggre0_noc_qosgen_extref_clk] > > > Signed-off-by: Bjorn Andersson > > > --- > > = > > This is still going on?! I'm going to ignore Rob's auto email on this > > patch. > > = > = > There wasn't much "going on" since your last reply, found this on the > floor between some chairs... > = > = > The issue pointed to you on v1 was that there was another patch that > already added two of the clocks, so this v2 simply drops the two > duplicated clocks; i.e. solves the merge conflict. > = > What I see now is that I did forget to carry Rob's R-b from v1. > = Ok. I see that I had applied it and then held off because of the duplicate entry error. I'll add Rob's reviewed-by and take this patch instead of the one I had months ago. Sad that we lose the proper parent linkage.