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

[Olof Johansson]

On Thu, Feb 20, 2014 at 4:58 PM, Stephen Rothwell <sfr at canb.auug.org.au> 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 cc60a1a4d47a ("ARM: dts: msm: split out msm8660 and
> msm8960 soc into dts include") from the arm-soc tree.
>
> I fixed it up (probably not the best way ... see below) and can carry the
> fix as necessary (no action is required).

Will, I think we'll be better off taking dts changes through arm-soc,
unless there's a good reason to take them through other trees (such as
the perf tree in this case). Is there, or should we move them over?


-Olof