Re: linux-next: manual merge of the pm tree with the arm-soc tree

2017-04-24 Thread Santosh Shilimkar
On 4/24/2017 11:02 AM, Dave Gerlach wrote: On 04/21/2017 04:54 PM, Santosh Shilimkar wrote: +Dave, [...] Ok, good, thanks for checking! They are however the commits that contain the silly https://urldefense.proofpoint.com URLs. Can you send a follow-up patch to fix these and use the regular

Re: linux-next: manual merge of the pm tree with the arm-soc tree

2017-04-24 Thread Dave Gerlach
On 04/21/2017 04:54 PM, Santosh Shilimkar wrote: +Dave, On 4/21/2017 2:44 PM, Arnd Bergmann wrote: On Fri, Apr 21, 2017 at 11:02 PM, santosh.shilim...@oracle.com wrote: On 4/21/17 2:31 AM, Arnd Bergmann wrote: [...] arm-soc/next/drivers: ae3874cc931b ARM: keystone: Drop PM domain support

Re: linux-next: manual merge of the pm tree with the arm-soc tree

2017-04-21 Thread Santosh Shilimkar
+Dave, On 4/21/2017 2:44 PM, Arnd Bergmann wrote: On Fri, Apr 21, 2017 at 11:02 PM, santosh.shilim...@oracle.com wrote: On 4/21/17 2:31 AM, Arnd Bergmann wrote: [...] arm-soc/next/drivers: ae3874cc931b ARM: keystone: Drop PM domain support for k2g 52835d59fc6c soc: ti: Add ti_sci_pm_domain

Re: linux-next: manual merge of the pm tree with the arm-soc tree

2017-04-21 Thread Santosh Shilimkar
On 4/21/2017 2:31 PM, Rafael J. Wysocki wrote: On Friday, April 21, 2017 02:02:35 PM santosh.shilim...@oracle.com wrote: On 4/21/17 2:31 AM, Arnd Bergmann wrote: On Fri, Apr 21, 2017 at 8:39 AM, santosh.shilim...@oracle.com [...] I still see two conflicting trees in linux-next as of toda

Re: linux-next: manual merge of the pm tree with the arm-soc tree

2017-04-21 Thread Arnd Bergmann
On Fri, Apr 21, 2017 at 11:02 PM, santosh.shilim...@oracle.com wrote: > On 4/21/17 2:31 AM, Arnd Bergmann wrote: >> >> On Fri, Apr 21, 2017 at 8:39 AM, santosh.shilim...@oracle.com >> wrote: >>> >>> On 4/20/17 10:53 PM, Arnd Bergmann wrote: On Fri, Apr 21, 2017 at 2:54 AM, Stephen

Re: linux-next: manual merge of the pm tree with the arm-soc tree

2017-04-21 Thread Rafael J. Wysocki
On Friday, April 21, 2017 02:02:35 PM santosh.shilim...@oracle.com wrote: > > On 4/21/17 2:31 AM, Arnd Bergmann wrote: > > On Fri, Apr 21, 2017 at 8:39 AM, santosh.shilim...@oracle.com > > wrote: > >> On 4/20/17 10:53 PM, Arnd Bergmann wrote: > >>> > >>> On Fri, Apr 21, 2017 at 2:54 AM, Stephen R

Re: linux-next: manual merge of the pm tree with the arm-soc tree

2017-04-21 Thread santosh.shilim...@oracle.com
On 4/21/17 2:31 AM, Arnd Bergmann wrote: On Fri, Apr 21, 2017 at 8:39 AM, santosh.shilim...@oracle.com wrote: On 4/20/17 10:53 PM, Arnd Bergmann wrote: On Fri, Apr 21, 2017 at 2:54 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the pm tree got a conflict in: include/

Re: linux-next: manual merge of the pm tree with the arm-soc tree

2017-04-21 Thread Arnd Bergmann
On Fri, Apr 21, 2017 at 8:39 AM, santosh.shilim...@oracle.com wrote: > On 4/20/17 10:53 PM, Arnd Bergmann wrote: >> >> On Fri, Apr 21, 2017 at 2:54 AM, Stephen Rothwell >> wrote: >>> >>> Hi all, >>> >>> Today's linux-next merge of the pm tree got a conflict in: >>> >>> include/dt-bindings/genpd

Re: linux-next: manual merge of the pm tree with the arm-soc tree

2017-04-20 Thread santosh.shilim...@oracle.com
On 4/20/17 10:53 PM, Arnd Bergmann wrote: On Fri, Apr 21, 2017 at 2:54 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the pm tree got a conflict in: include/dt-bindings/genpd/k2g.h between commit: 7cc119f29b19 ("dt-bindings: Add TI SCI PM Domains") from the arm-soc tre

Re: linux-next: manual merge of the pm tree with the arm-soc tree

2017-04-20 Thread Arnd Bergmann
On Fri, Apr 21, 2017 at 2:54 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the pm tree got a conflict in: > > include/dt-bindings/genpd/k2g.h > > between commit: > > 7cc119f29b19 ("dt-bindings: Add TI SCI PM Domains") > > from the arm-soc tree and commit: > > 45da8edd

Re: linux-next: manual merge of the pm tree with the arm-soc tree

2017-04-19 Thread Rafael J. Wysocki
On Thursday, April 20, 2017 10:34:27 AM Stephen Rothwell wrote: > Hi Rafael, > > Today's linux-next merge of the pm tree got a conflict in: > > arch/arm/boot/dts/sun8i-a33.dtsi > > between commits: > > 66c373228dc4 ("ARM: sun8i: a33: Add the Mali OPPs") > e6bd37627e92 ("ARM: sun8i: a33: a

Re: linux-next: manual merge of the pm tree with the arm-soc tree

2014-09-10 Thread Rafael J. Wysocki
On Wednesday, September 10, 2014 02:18:50 PM Stephen Rothwell wrote: > Hi Rafael, > > Today's linux-next merge of the pm tree got a conflict in > arch/arm/mach-shmobile/setup-sh73a0.c between commit aa0bdc303b0f > ("ARM: shmobile: sh73a0: Remove duplicate CPUFreq bits") from the > arm-soc tree and

Re: linux-next: manual merge of the pm tree with the arm-soc tree

2014-07-30 Thread Rafael J. Wysocki
On Wednesday, July 30, 2014 12:23:05 PM Stephen Rothwell wrote: > > --Sig_/ACOdpNyKdCGq/4_bRoeLLze > Content-Type: text/plain; charset=US-ASCII > Content-Transfer-Encoding: quoted-printable > > Hi Rafael, Hi Stephen, > Today's linux-next merge of the pm tree got a conflict in > drivers/cpuidle/