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

2015-03-24 Thread Suzuki K. Poulose
On 23/03/15 21:16, Stephen Rothwell wrote: Hi all, On Mon, 23 Mar 2015 15:13:51 + "Suzuki K. Poulose" wrote: On 23/03/15 14:41, Abhilash Kesavan wrote: On Mon, Mar 23, 2015 at 6:03 AM, Stephen Rothwell wrote: Today's linux-next merge of the arm-soc tree got a conflict in drivers/bus

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

2015-03-23 Thread Stephen Rothwell
Hi all, On Mon, 23 Mar 2015 15:13:51 + "Suzuki K. Poulose" wrote: > > On 23/03/15 14:41, Abhilash Kesavan wrote: > > > > On Mon, Mar 23, 2015 at 6:03 AM, Stephen Rothwell > > wrote: > >> > >> Today's linux-next merge of the arm-soc tree got a conflict in > >> drivers/bus/Kconfig between co

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

2015-03-23 Thread Suzuki K. Poulose
On 23/03/15 14:41, Abhilash Kesavan wrote: Hi Stephen, On Mon, Mar 23, 2015 at 6:03 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/bus/Kconfig between commit c9966c98697a ("arm-cci: Split the code for PMU vs driver support") from the

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

2015-03-23 Thread Abhilash Kesavan
Hi Stephen, On Mon, Mar 23, 2015 at 6:03 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > drivers/bus/Kconfig between commit c9966c98697a ("arm-cci: Split the > code for PMU vs driver support") from the arm-perf tree and commit > 13fbf3c8d

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

2015-03-22 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/bus/Kconfig between commit c9966c98697a ("arm-cci: Split the code for PMU vs driver support") from the arm-perf tree and commit 13fbf3c8d0f7 ("drivers: bus: Sort Kconfig entries alphabetically") from the arm-soc tree.

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

2014-02-21 Thread Olof Johansson
On Fri, Feb 21, 2014 at 3:09 AM, Will Deacon wrote: > On Fri, Feb 21, 2014 at 01:02:47AM +, Olof Johansson wrote: >> On Thu, Feb 20, 2014 at 4:58 PM, Stephen Rothwell >> wrote: >> > Today's linux-next merge of the arm-soc tree got a conflict in >> > arch/arm/boot/dts/qcom-msm8960-cdp.dts bet

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

2014-02-21 Thread Will Deacon
On Fri, Feb 21, 2014 at 01:02:47AM +, Olof Johansson wrote: > On Thu, Feb 20, 2014 at 4:58 PM, Stephen Rothwell > wrote: > > Today's linux-next merge of the arm-soc tree got a conflict in > > arch/arm/boot/dts/qcom-msm8960-cdp.dts between commit a1d711938959 ("ARM: > > dts: msm: Add krait-pmu

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

2014-02-20 Thread Stephen Boyd
On 02/20/14 16:58, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/boot/dts/qcom-msm8960-cdp.dts between commit a1d711938959 ("ARM: > dts: msm: Add krait-pmu to platforms with Krait CPUs") from the arm-perf > tree and commit cc60a1a4d4

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

2014-02-20 Thread Olof Johansson
On Thu, Feb 20, 2014 at 4:58 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/boot/dts/qcom-msm8960-cdp.dts between commit a1d711938959 ("ARM: > dts: msm: Add krait-pmu to platforms with Krait CPUs") from the arm-perf > tree and co

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

2014-02-20 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/boot/dts/qcom-msm8960-cdp.dts between commit a1d711938959 ("ARM: dts: msm: Add krait-pmu to platforms with Krait CPUs") from the arm-perf tree and commit cc60a1a4d47a ("ARM: dts: msm: split out msm8660 and msm8960 soc