[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-next
Subject:    Re: linux-next: manual merge of the pm tree with the imx-mxs tree
From:       Lina Iyer <lina.iyer () linaro ! org>
Date:       2016-10-25 3:32:08
Message-ID: 20161025033208.GI72940 () linaro ! org
[Download RAW message or body]

On Tue, Oct 25 2016 at 17:51 -0600, Rafael J. Wysocki wrote:
>On Tuesday, October 25, 2016 10:47:29 AM Stephen Rothwell wrote:
>> Hi Rafael,
>>
>> Today's linux-next merge of the pm tree got a conflict in:
>>
>>   arch/arm/mach-imx/gpc.c
>>
>> between commits:
>>
>>   eef0b282bb58 ("ARM: imx: gpc: Initialize all power domains")
>>   f9d1f7a7ad91 ("ARM: imx: gpc: Fix the imx_gpc_genpd_init() error path")
>>
>> from the imx-mxs tree and commit:
>>
>>   59d65b73a23c ("PM / Domains: Make genpd state allocation dynamic")
>>
>> from the pm tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary.
>
>Thanks Stephen!
>
>Lina, please have a look at the Stephen's fix and let me know if that
>conflict should be resolved in a different way.
>
Hi Rafael,
Stephen's conflict resolution seems correct. Thanks Stephen.

-- Lina
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]