From: Stephen Boyd <sboyd@codeaurora.org>
To: linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v5] ARM: smp: Only expose /sys/.../cpuX/online if hotpluggable
Date: Fri, 17 Jul 2015 21:21:05 +0000 [thread overview]
Message-ID: <55A971C1.8090308@codeaurora.org> (raw)
In-Reply-To: <5578C427.1070100@codeaurora.org>
On 06/10/2015 04:11 PM, Stephen Boyd wrote:
> On 06/10/2015 03:57 PM, Russell King - ARM Linux wrote:
>> diff --git a/arch/arm/mach-shmobile/common.h b/arch/arm/mach-shmobile/common.h
>> index 476092b86c6e..f2c4bf437ea7 100644
>> --- a/arch/arm/mach-shmobile/common.h
>> +++ b/arch/arm/mach-shmobile/common.h
>> @@ -13,7 +13,8 @@ extern void shmobile_smp_boot(void);
>> extern void shmobile_smp_sleep(void);
>> extern void shmobile_smp_hook(unsigned int cpu, unsigned long fn,
>> unsigned long arg);
>> -extern int shmobile_smp_cpu_disable(unsigned int cpu);
>> +extern bool shmobile_smp_cpu_can_disable(unsigned int cpu);
>> +extern void shmobile_invalidate_start(void);
>>
>> which your original patch did not include. The tree I'm applying to
>> (-rc1) contains:
>>
>> extern int shmobile_smp_cpu_disable(unsigned int cpu);
>> extern void shmobile_invalidate_start(void);
>>
>> there. Hence git quite rightfully declines to apply the patch.
>>
> Thanks. Fixed.
>
Sorry I just noticed that you applied 8392/1 instead of 8392/2 from the
patch tracker. So shmobile_invalidate_start() came back.
I thought it would automatically supersede the previous patch but it
looks like it just sticks around? I've never had to replace a patch
before so I'll keep this in mind next time.
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
WARNING: multiple messages have this Message-ID (diff)
From: sboyd@codeaurora.org (Stephen Boyd)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5] ARM: smp: Only expose /sys/.../cpuX/online if hotpluggable
Date: Fri, 17 Jul 2015 14:21:05 -0700 [thread overview]
Message-ID: <55A971C1.8090308@codeaurora.org> (raw)
In-Reply-To: <5578C427.1070100@codeaurora.org>
On 06/10/2015 04:11 PM, Stephen Boyd wrote:
> On 06/10/2015 03:57 PM, Russell King - ARM Linux wrote:
>> diff --git a/arch/arm/mach-shmobile/common.h b/arch/arm/mach-shmobile/common.h
>> index 476092b86c6e..f2c4bf437ea7 100644
>> --- a/arch/arm/mach-shmobile/common.h
>> +++ b/arch/arm/mach-shmobile/common.h
>> @@ -13,7 +13,8 @@ extern void shmobile_smp_boot(void);
>> extern void shmobile_smp_sleep(void);
>> extern void shmobile_smp_hook(unsigned int cpu, unsigned long fn,
>> unsigned long arg);
>> -extern int shmobile_smp_cpu_disable(unsigned int cpu);
>> +extern bool shmobile_smp_cpu_can_disable(unsigned int cpu);
>> +extern void shmobile_invalidate_start(void);
>>
>> which your original patch did not include. The tree I'm applying to
>> (-rc1) contains:
>>
>> extern int shmobile_smp_cpu_disable(unsigned int cpu);
>> extern void shmobile_invalidate_start(void);
>>
>> there. Hence git quite rightfully declines to apply the patch.
>>
> Thanks. Fixed.
>
Sorry I just noticed that you applied 8392/1 instead of 8392/2 from the
patch tracker. So shmobile_invalidate_start() came back.
I thought it would automatically supersede the previous patch but it
looks like it just sticks around? I've never had to replace a patch
before so I'll keep this in mind next time.
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Boyd <sboyd@codeaurora.org>
To: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: Mark Rutland <mark.rutland@arm.com>,
linux-sh@vger.kernel.org, Tyler Baker <tyler.baker@linaro.org>,
Nicolas Pitre <nico@linaro.org>,
Magnus Damm <magnus.damm@gmail.com>,
linux-kernel@vger.kernel.org, Simon Horman <horms@verge.net.au>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Dave Martin <Dave.Martin@arm.com>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v5] ARM: smp: Only expose /sys/.../cpuX/online if hotpluggable
Date: Fri, 17 Jul 2015 14:21:05 -0700 [thread overview]
Message-ID: <55A971C1.8090308@codeaurora.org> (raw)
In-Reply-To: <5578C427.1070100@codeaurora.org>
On 06/10/2015 04:11 PM, Stephen Boyd wrote:
> On 06/10/2015 03:57 PM, Russell King - ARM Linux wrote:
>> diff --git a/arch/arm/mach-shmobile/common.h b/arch/arm/mach-shmobile/common.h
>> index 476092b86c6e..f2c4bf437ea7 100644
>> --- a/arch/arm/mach-shmobile/common.h
>> +++ b/arch/arm/mach-shmobile/common.h
>> @@ -13,7 +13,8 @@ extern void shmobile_smp_boot(void);
>> extern void shmobile_smp_sleep(void);
>> extern void shmobile_smp_hook(unsigned int cpu, unsigned long fn,
>> unsigned long arg);
>> -extern int shmobile_smp_cpu_disable(unsigned int cpu);
>> +extern bool shmobile_smp_cpu_can_disable(unsigned int cpu);
>> +extern void shmobile_invalidate_start(void);
>>
>> which your original patch did not include. The tree I'm applying to
>> (-rc1) contains:
>>
>> extern int shmobile_smp_cpu_disable(unsigned int cpu);
>> extern void shmobile_invalidate_start(void);
>>
>> there. Hence git quite rightfully declines to apply the patch.
>>
> Thanks. Fixed.
>
Sorry I just noticed that you applied 8392/1 instead of 8392/2 from the
patch tracker. So shmobile_invalidate_start() came back.
I thought it would automatically supersede the previous patch but it
looks like it just sticks around? I've never had to replace a patch
before so I'll keep this in mind next time.
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2015-07-17 21:21 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-10 22:33 [PATCH v5] ARM: smp: Only expose /sys/.../cpuX/online if hotpluggable Stephen Boyd
2015-04-10 22:33 ` Stephen Boyd
2015-04-10 22:33 ` Stephen Boyd
2015-04-11 17:23 ` Tyler Baker
2015-04-11 17:23 ` Tyler Baker
2015-04-11 17:23 ` Tyler Baker
2015-04-13 13:42 ` Russell King - ARM Linux
2015-04-13 13:42 ` Russell King - ARM Linux
2015-04-13 13:42 ` Russell King - ARM Linux
2015-06-09 19:08 ` Stephen Boyd
2015-06-09 19:08 ` Stephen Boyd
2015-06-09 19:08 ` Stephen Boyd
2015-06-09 21:02 ` Russell King - ARM Linux
2015-06-09 21:02 ` Russell King - ARM Linux
2015-06-09 21:02 ` Russell King - ARM Linux
2015-06-10 9:58 ` Catalin Marinas
2015-06-10 9:58 ` Catalin Marinas
2015-06-10 9:58 ` Catalin Marinas
2015-06-10 22:57 ` Russell King - ARM Linux
2015-06-10 22:57 ` Russell King - ARM Linux
2015-06-10 22:57 ` Russell King - ARM Linux
2015-06-10 23:11 ` Stephen Boyd
2015-06-10 23:11 ` Stephen Boyd
2015-06-10 23:11 ` Stephen Boyd
2015-07-17 21:21 ` Stephen Boyd [this message]
2015-07-17 21:21 ` Stephen Boyd
2015-07-17 21:21 ` Stephen Boyd
2015-07-25 15:01 ` Russell King - ARM Linux
2015-07-25 15:01 ` Russell King - ARM Linux
2015-07-25 15:01 ` Russell King - ARM Linux
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=55A971C1.8090308@codeaurora.org \
--to=sboyd@codeaurora.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 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.