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

2016-10-24 Thread Lina Iyer
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

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

2016-10-24 Thread Shawn Guo
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: > > > > eef0b282bb

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

2016-10-24 Thread Rafael J. Wysocki
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: Fi