Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965507AbcJYDcN (ORCPT ); Mon, 24 Oct 2016 23:32:13 -0400 Received: from mail-yw0-f175.google.com ([209.85.161.175]:34428 "EHLO mail-yw0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965208AbcJYDcL (ORCPT ); Mon, 24 Oct 2016 23:32:11 -0400 Date: Mon, 24 Oct 2016 21:32:08 -0600 From: Lina Iyer To: "Rafael J. Wysocki" Cc: Stephen Rothwell , Shawn Guo , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Fabio Estevam Subject: Re: linux-next: manual merge of the pm tree with the imx-mxs tree Message-ID: <20161025033208.GI72940@linaro.org> References: <20161025104729.35f5b009@canb.auug.org.au> <8126928.lSNgbyj5lv@vostro.rjw.lan> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <8126928.lSNgbyj5lv@vostro.rjw.lan> User-Agent: Mutt/1.7.1 (2016-10-04) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 838 Lines: 30 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