From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: kvm: rename cpu_reset to avoid name clash
Date: Mon, 23 Sep 2013 12:59:44 -0700 [thread overview]
Message-ID: <CAOesGMhPHaZ7tOshbvU1M87nshTOVqU7-+1AvOmARzKUDN6syw@mail.gmail.com> (raw)
In-Reply-To: <CAMJs5B9NW6cDuG-xwYucP8rONn0MdEtwTm5R2p=aBE4Q3EHNOg@mail.gmail.com>
Hi Christoffer,
On Mon, Sep 16, 2013 at 8:47 PM, Christoffer Dall
<christoffer.dall@linaro.org> wrote:
> On 16 September 2013 19:41, Olof Johansson <olof@lixom.net> wrote:
>> Hi,
>>
>> On Wed, Sep 11, 2013 at 6:50 PM, Christoffer Dall
>> <christoffer.dall@linaro.org> wrote:
>>> On Wed, Sep 11, 2013 at 03:39:26PM -0700, Olof Johansson wrote:
>>>> On Wed, Sep 11, 2013 at 3:27 PM, Olof Johansson <olof@lixom.net> wrote:
>>>> > cpu_reset is already #defined in <asm/proc-fns.h> as processor.reset,
>>>> > so it expands here and causes problems.
>>>> >
>>>> > Signed-off-by: Olof Johansson <olof@lixom.net>
>>>>
>>>> I just noticed this is broken on 3.10 too, so if/when applying feel free to add:
>>>>
>>>> Cc: <stable@vger.kernel.org> # 3.10+
>>>>
>>> Thanks for the fix, applied.
>>
>> I haven't seen this hit linux-next yet?
>>
> I was waiting for kvm/next to move to 3.12-rc1 and base the patch for
> kvm-arm-next off there, but I pushed this to kvm-arm-next now and it
> should land in linux-next as soon as they update.
Another week has passed, and -next and mainline are both still broken.
Can we please see a fix in mainline and -next within the next few
days?
-Olof
next prev parent reply other threads:[~2013-09-23 19:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-11 22:27 [PATCH] ARM: kvm: rename cpu_reset to avoid name clash Olof Johansson
2013-09-11 22:39 ` Olof Johansson
2013-09-12 1:50 ` Christoffer Dall
2013-09-17 0:41 ` Olof Johansson
2013-09-17 3:47 ` Christoffer Dall
2013-09-23 19:59 ` Olof Johansson [this message]
2013-09-23 20:30 ` Russell King - ARM Linux
2013-09-23 21:05 ` Christoffer Dall
-- strict thread matches above, loose matches on Subject: below --
2013-09-24 19:49 [GIT PULL] KVM/ARM Fixes for 3.12-rc2 Christoffer Dall
2013-09-24 19:49 ` [PATCH] ARM: kvm: rename cpu_reset to avoid name clash Christoffer Dall
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=CAOesGMhPHaZ7tOshbvU1M87nshTOVqU7-+1AvOmARzKUDN6syw@mail.gmail.com \
--to=olof@lixom.net \
--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).