Re: [PATCH v2] drm/msm/dp: add drm debug logs to dp_pm_resume/suspend

[khsieh]

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 <khsieh@xxxxxxxxxxxxxx>
> > ---
> >  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?