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=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 1A1F5C4338F for ; Tue, 10 Aug 2021 19:18:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EF43B6056B for ; Tue, 10 Aug 2021 19:18:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232466AbhHJTSr (ORCPT ); Tue, 10 Aug 2021 15:18:47 -0400 Received: from so254-9.mailgun.net ([198.61.254.9]:61236 "EHLO so254-9.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231366AbhHJTSl (ORCPT ); Tue, 10 Aug 2021 15:18:41 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1628623099; h=Message-ID: References: In-Reply-To: Subject: Cc: To: From: Date: Content-Transfer-Encoding: Content-Type: MIME-Version: Sender; bh=VePqsGao1NYt2UQA4Rp7SOWGsUOpS/mcxe5gSE4XsEg=; b=Qec3n2i+SvOMcIXvv/oGPdfqt9ngYohSNJJzhm7ACBsFXyeoA8+082G5At4Z/6jO3J4BeQdx /Vm2maYRMcb4j8XOFCjfU5f81tGb9OlMzUuc2x8WO9I2NwRGDY4YmEM/yxNyfjRRfUsJfEtN Z6q2Ibw8ybq4uV8H16BzpIXTf8Q= X-Mailgun-Sending-Ip: 198.61.254.9 X-Mailgun-Sid: WyI0MWYwYSIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n03.prod.us-west-2.postgun.com with SMTP id 6112d0edf746c298d9558c69 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Tue, 10 Aug 2021 19:18:05 GMT Sender: khsieh=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 99631C43144; Tue, 10 Aug 2021 19:18:05 +0000 (UTC) Received: from mail.codeaurora.org (localhost.localdomain [127.0.0.1]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: khsieh) by smtp.codeaurora.org (Postfix) with ESMTPSA id ACC12C433D3; Tue, 10 Aug 2021 19:18:02 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Tue, 10 Aug 2021 12:18:02 -0700 From: khsieh@codeaurora.org To: Stephen Boyd Cc: agross@kernel.org, bjorn.andersson@linaro.org, robdclark@gmail.com, sean@poorly.run, vkoul@kernel.org, abhinavk@codeaurora.org, aravindh@codeaurora.org, freedreno@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] drm/msm/dp: add drm debug logs to dp_pm_resume/suspend In-Reply-To: References: <1628609362-2109-1-git-send-email-khsieh@codeaurora.org> Message-ID: X-Sender: khsieh@codeaurora.org User-Agent: Roundcube Webmail/1.3.9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2021-08-10 11:33, Stephen Boyd wrote: > Quoting Kuogee Hsieh (2021-08-10 08:29:22) >> Changes in V2: >> -- correct Fixes text >> -- drop commit text >> >> Fixes: 601f0479c583 ("drm/msm/dp: add logs across DP driver for ease >> of debugging") >> Signed-off-by: Kuogee Hsieh >> --- >> drivers/gpu/drm/msm/dp/dp_display.c | 13 +++++++++++++ >> 1 file changed, 13 insertions(+) > > BTW, this conflicts with commit > e8a767e04dbc7b201cb17ab99dca723a3488b6d4 > in msm-next. The resolution is trivial but just wanted to mention it. I Just fetched msm-next and cherry-pick this patch over, no conflict seen. Is this conflict need to be fixed?