From: khilman@linaro.org (Kevin Hilman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 2/4] ARM: debug: support debug ll on hisilicon soc
Date: Thu, 15 Aug 2013 08:44:56 -0700 [thread overview]
Message-ID: <87ioz7m007.fsf@kernel.org> (raw)
In-Reply-To: <CAOesGMhyv6oT3Mk48NHPz-s8XSWhrE7_ig5qpB1vQW2x9c4GhA@mail.gmail.com> (Olof Johansson's message of "Wed, 14 Aug 2013 16:03:44 -0700")
Olof Johansson <olof@lixom.net> writes:
> On Wed, Aug 14, 2013 at 3:54 PM, Russell King - ARM Linux
> <linux@arm.linux.org.uk> wrote:
[...]
>> CONFLICT (delete/modify): arch/arm/include/debug/highbank.S deleted
>> in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next
>> of arch/arm/include/debug/highbank.S left in tree.
>>
>> which seems to be a change in the virtual address of the port. This
>> one is particularly nasty because it needs to be moved to a completely
>> different file and therefore is not git rerere'able. Does it have any
>> dependencies?
>
> I don't think so, we can likely move that patch over to your tree
> instead and drop it from arm-soc.
The highbank change is now dropped from arm-soc and needs to be be
rebased/reworked on your tree.
Kevin
next prev parent reply other threads:[~2013-08-15 15:44 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-26 4:32 [PATCH v6 0/6] support Hisilicon SoC Haojian Zhuang
2013-07-26 4:32 ` [PATCH v6 1/4] clk: hi3xxx: add clock support Haojian Zhuang
2013-08-09 15:14 ` Mark Rutland
2013-07-26 4:32 ` [PATCH v6 2/4] ARM: debug: support debug ll on hisilicon soc Haojian Zhuang
2013-08-14 6:39 ` Olof Johansson
2013-08-14 15:44 ` Russell King - ARM Linux
2013-08-14 16:25 ` Olof Johansson
2013-08-14 22:54 ` Russell King - ARM Linux
2013-08-14 23:03 ` Olof Johansson
2013-08-15 15:44 ` Kevin Hilman [this message]
2013-08-14 6:44 ` Olof Johansson
2013-08-14 15:32 ` Haojian Zhuang
2013-08-14 15:46 ` Russell King - ARM Linux
2013-08-14 15:50 ` Haojian Zhuang
2013-07-26 4:32 ` [PATCH v6 3/4] ARM: hi3xxx: add board support with device tree Haojian Zhuang
2013-08-09 15:18 ` Mark Rutland
2013-08-14 6:48 ` Olof Johansson
2013-07-26 4:32 ` [PATCH v6 4/4] ARM: hi3xxx: enable hi4511 " Haojian Zhuang
2013-08-09 15:25 ` Mark Rutland
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=87ioz7m007.fsf@kernel.org \
--to=khilman@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).