linux-kernel - Re: linux-next: manual merge of the pm tree with the imx-mxs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Mon, 24 Oct 2016 21:32:08 -0600
From:   Lina Iyer <lina.iyer@...aro.org>
To:     "Rafael J. Wysocki" <rjw@...ysocki.net>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Shawn Guo <shawn.guo@...aro.org>, linux-next@...r.kernel.org,
        linux-kernel@...r.kernel.org, Fabio Estevam <fabio.estevam@....com>
Subject: Re: linux-next: manual merge of the pm tree with the imx-mxs tree

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