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

Hi all, Today's linux-next merge of the pm tree got a conflict in: drivers/soc/ti/Makefile between commit: dc1129564a01 ("soc: ti: pruss: Add a platform driver for PRUSS in TI SoCs") from the arm-soc tree and commit: bca815d62054 ("PM: AVS: smartreflex Move driver to soc specific

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

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

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

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

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

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:

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

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

+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

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

+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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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:

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

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

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

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: >>> >>>

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

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

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

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

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

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

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

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: > >

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

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: 45da8edd1741 ("dt-bindings: Add TI SCI PM Domains") from the pm tree. I fixed it up

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

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: 45da8edd1741 ("dt-bindings: Add TI SCI PM Domains") from the pm tree. I fixed it up

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

Hi Rafael, Today's linux-next merge of the pm tree got a conflict in: drivers/soc/ti/ti_sci_pm_domains.c between commit: 52835d59fc6c ("soc: ti: Add ti_sci_pm_domains driver") from the arm-soc tree and commit: 112572283742 ("soc: ti: Add ti_sci_pm_domains driver") from the pm tree. I

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

Hi Rafael, Today's linux-next merge of the pm tree got a conflict in: drivers/soc/ti/ti_sci_pm_domains.c between commit: 52835d59fc6c ("soc: ti: Add ti_sci_pm_domains driver") from the arm-soc tree and commit: 112572283742 ("soc: ti: Add ti_sci_pm_domains driver") from the pm tree. I

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

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:

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

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:

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

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: add all operating points") from the arm-soc tree and commit: d87bd1942058 ("PM /

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

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: add all operating points") from the arm-soc tree and commit: d87bd1942058 ("PM /

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

Hi Rafael, Today's linux-next merge of the pm tree got a conflict in: MAINTAINERS between commit: e269777f72b3 ("MAINTAINERS: attach arch/arm/configs/mvebu_*_defconfig to relevant maintainers") from the arm-soc tree and commit: 9f123def55d3 ("cpufreq: mvebu: Move cpufreq code into

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

Hi Rafael, Today's linux-next merge of the pm tree got a conflict in: MAINTAINERS between commit: e269777f72b3 ("MAINTAINERS: attach arch/arm/configs/mvebu_*_defconfig to relevant maintainers") from the arm-soc tree and commit: 9f123def55d3 ("cpufreq: mvebu: Move cpufreq code into

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

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

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

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 commit

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

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 commit 978027e170fb ("cpufreq: cpu0: rename driver and internals to

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

Hi Rafael, Today's linux-next merge of the pm tree got a conflict in arch/arm/mach-shmobile/board-ape6evm-reference.c between commit 664b4c172209 ("ARM: shmobile: ape6evm: Remove duplicate CPUFreq bits") from the arm-soc tree and commit 978027e170fb ("cpufreq: cpu0: rename driver and internals to

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

Hi Rafael, Today's linux-next merge of the pm tree got a conflict in arch/arm/mach-shmobile/board-ape6evm-reference.c between commit 664b4c172209 (ARM: shmobile: ape6evm: Remove duplicate CPUFreq bits) from the arm-soc tree and commit 978027e170fb (cpufreq: cpu0: rename driver and internals to

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

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 commit 978027e170fb (cpufreq: cpu0: rename driver and internals to 'cpufreq_dt')

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

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 >

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

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

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

Hi Rafael, Today's linux-next merge of the pm tree got a conflict in drivers/cpuidle/Kconfig.arm between commit 2aaafcdb6883 ("cpuidle: big.LITTLE: Add ARCH_EXYNOS entry in config") from the arm-soc tree and commit 6ee7f5dd57fc ("cpuidle: big_little: Fix build error") from the pm tree. I fixed

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

Hi Rafael, Today's linux-next merge of the pm tree got a conflict in drivers/cpuidle/Kconfig.arm between commit 2aaafcdb6883 (cpuidle: big.LITTLE: Add ARCH_EXYNOS entry in config) from the arm-soc tree and commit 6ee7f5dd57fc (cpuidle: big_little: Fix build error) from the pm tree. I fixed it up