From: Stephen Boyd <sboyd@codeaurora.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org,
Will Deacon <will.deacon@arm.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Kumar Gala <galak@codeaurora.org>
Subject: Re: linux-next: manual merge of the arm-soc tree with the arm-perf tree
Date: Thu, 20 Feb 2014 17:02:52 -0800 [thread overview]
Message-ID: <5306A5BC.8010409@codeaurora.org> (raw)
In-Reply-To: <20140221115857.3ea3d7277d03c5b6b4d26488@canb.auug.org.au>
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 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).
>
It's good enough to be correct, but it would be better if the pmu node
went into the arch/arm/boot/dts/qcom-msm8960.dtsi file in the arm-soc tree.
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
WARNING: multiple messages have this Message-ID (diff)
From: sboyd@codeaurora.org (Stephen Boyd)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the arm-perf tree
Date: Thu, 20 Feb 2014 17:02:52 -0800 [thread overview]
Message-ID: <5306A5BC.8010409@codeaurora.org> (raw)
In-Reply-To: <20140221115857.3ea3d7277d03c5b6b4d26488@canb.auug.org.au>
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 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).
>
It's good enough to be correct, but it would be better if the pmu node
went into the arch/arm/boot/dts/qcom-msm8960.dtsi file in the arm-soc tree.
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
next prev parent reply other threads:[~2014-02-21 1:02 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-21 0:58 linux-next: manual merge of the arm-soc tree with the arm-perf tree Stephen Rothwell
2014-02-21 0:58 ` Stephen Rothwell
2014-02-21 0:58 ` Stephen Rothwell
2014-02-21 1:02 ` Olof Johansson
2014-02-21 1:02 ` Olof Johansson
2014-02-21 11:09 ` Will Deacon
2014-02-21 11:09 ` Will Deacon
2014-02-21 11:09 ` Will Deacon
2014-02-22 0:46 ` Olof Johansson
2014-02-22 0:46 ` Olof Johansson
2014-02-21 1:02 ` Stephen Boyd [this message]
2014-02-21 1:02 ` Stephen Boyd
-- strict thread matches above, loose matches on Subject: below --
2015-03-23 0:33 Stephen Rothwell
2015-03-23 0:33 ` Stephen Rothwell
2015-03-23 0:33 ` Stephen Rothwell
2015-03-23 14:41 ` Abhilash Kesavan
2015-03-23 14:41 ` Abhilash Kesavan
2015-03-23 15:13 ` Suzuki K. Poulose
2015-03-23 15:13 ` Suzuki K. Poulose
2015-03-23 21:16 ` Stephen Rothwell
2015-03-23 21:16 ` Stephen Rothwell
2015-03-24 14:59 ` Suzuki K. Poulose
2015-03-24 14:59 ` Suzuki K. Poulose
2024-01-02 23:03 Stephen Rothwell
2024-01-02 23:03 ` Stephen Rothwell
2024-01-03 17:30 ` Will Deacon
2024-01-03 17:30 ` Will Deacon
2024-01-03 17:38 ` Arnd Bergmann
2024-01-03 17:38 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5306A5BC.8010409@codeaurora.org \
--to=sboyd@codeaurora.org \
--cc=arnd@arndb.de \
--cc=galak@codeaurora.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.