Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755924AbcJXX4X (ORCPT ); Mon, 24 Oct 2016 19:56:23 -0400 Received: from mail.kernel.org ([198.145.29.136]:33698 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754880AbcJXX4W (ORCPT ); Mon, 24 Oct 2016 19:56:22 -0400 Date: Tue, 25 Oct 2016 07:55:58 +0800 From: Shawn Guo To: "Rafael J. Wysocki" Cc: Stephen Rothwell , Lina Iyer , 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: <20161024235558.GN30578@tiger> References: <20161025104729.35f5b009@canb.auug.org.au> <8126928.lSNgbyj5lv@vostro.rjw.lan> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <8126928.lSNgbyj5lv@vostro.rjw.lan> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 982 Lines: 32 On Tue, Oct 25, 2016 at 01:58:25AM +0200, 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. FYI. We target the following two fixes 4.9-rc. eef0b282bb58 ("ARM: imx: gpc: Initialize all power domains") f9d1f7a7ad91 ("ARM: imx: gpc: Fix the imx_gpc_genpd_init() error path") Shawn