Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
On 05/20/13 14:29, Viresh Kumar wrote: [...] Rafael, if you don't mind, let me take this into Samsung tree for v3.11. Sure, please go ahead. Kukjin, I hope you have already applied this for linux-next? Yeah, already done in my local and you can see it in my public tree in a couple of hours :-) Thanks. - Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
On 14 May 2013 18:30, Rafael J. Wysocki wrote: > On Tuesday, May 14, 2013 09:36:42 PM Kukjin Kim wrote: >> Viresh Kumar wrote: >> > >> > On 13 May 2013 16:21, Rafael J. Wysocki wrote: >> > > That doesn't matter I suppose. I can take it, but please rebase it on >> > top >> > > of current linux-next. >> > >> > I have already done that (attached). But i wasn't sure what Kukjin wants >> > as >> > he may report conflicts again and i will ask the same question for 3.12 :) >> > >> Since this missed last time, this would be sent to upstream via samsung tree >> again. It means the conflicts should be handled by myself. >> >> Rafael, if you don't mind, let me take this into Samsung tree for v3.11. > > Sure, please go ahead. Kukjin, I hope you have already applied this for linux-next? -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
On Tuesday, May 14, 2013 09:36:42 PM Kukjin Kim wrote: > Viresh Kumar wrote: > > > > On 13 May 2013 16:21, Rafael J. Wysocki wrote: > > > That doesn't matter I suppose. I can take it, but please rebase it on > > top > > > of current linux-next. > > > > I have already done that (attached). But i wasn't sure what Kukjin wants > > as > > he may report conflicts again and i will ask the same question for 3.12 :) > > > Since this missed last time, this would be sent to upstream via samsung tree > again. It means the conflicts should be handled by myself. > > Rafael, if you don't mind, let me take this into Samsung tree for v3.11. Sure, please go ahead. Thanks, Rafael -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
Viresh Kumar wrote: > > On 13 May 2013 16:21, Rafael J. Wysocki wrote: > > That doesn't matter I suppose. I can take it, but please rebase it on > top > > of current linux-next. > > I have already done that (attached). But i wasn't sure what Kukjin wants > as > he may report conflicts again and i will ask the same question for 3.12 :) > Since this missed last time, this would be sent to upstream via samsung tree again. It means the conflicts should be handled by myself. Rafael, if you don't mind, let me take this into Samsung tree for v3.11. - Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
On 13 May 2013 16:21, Rafael J. Wysocki wrote: > That doesn't matter I suppose. I can take it, but please rebase it on top > of current linux-next. I have already done that (attached). But i wasn't sure what Kukjin wants as he may report conflicts again and i will ask the same question for 3.12 :) -- viresh 0001-cpufreq-s3c24xx-move-cpufreq-driver-to-drivers-cpufr.patch Description: Binary data
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
On Monday, May 13, 2013 11:35:22 AM Viresh Kumar wrote: > On 23 April 2013 20:55, Kukjin Kim wrote: > > On 04/05/13 20:36, Rafael J. Wysocki wrote: > >> > >> On Friday, April 05, 2013 12:36:34 PM Viresh Kumar wrote: > >>> > >>> On 5 April 2013 12:18, Kukjin Kim wrote: > > Basically, this moving looks good to me, but should be re-worked based > on > for-next of samsung tree because this touches too many samsung stuff so > this > should be sent to upstream via samsung tree. > >>> > >>> > >>> Hmm... Its already applied in Rafael's tree. But it doesn't mean that > >>> it can't be > >>> moved to your tree if there is a issue. > >> > >> > >> Well, I'm dropping it. Please merge via the Samsung tree. > >> > > > > Oops, I missed, maybe I have no more chance to send this to upstream for > > upcoming merge window :-( > > > > Rafael, please take this patch with my ack in your tree, sorry for noise. > > > > Acked-by: Kukjin Kim > > > > If any problems, please kindly let me know. > > Who is going to pick this patch now for next merge window? That doesn't matter I suppose. I can take it, but please rebase it on top of current linux-next. Thanks, Rafael -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
On 23 April 2013 20:55, Kukjin Kim wrote: > On 04/05/13 20:36, Rafael J. Wysocki wrote: >> >> On Friday, April 05, 2013 12:36:34 PM Viresh Kumar wrote: >>> >>> On 5 April 2013 12:18, Kukjin Kim wrote: Basically, this moving looks good to me, but should be re-worked based on for-next of samsung tree because this touches too many samsung stuff so this should be sent to upstream via samsung tree. >>> >>> >>> Hmm... Its already applied in Rafael's tree. But it doesn't mean that >>> it can't be >>> moved to your tree if there is a issue. >> >> >> Well, I'm dropping it. Please merge via the Samsung tree. >> > > Oops, I missed, maybe I have no more chance to send this to upstream for > upcoming merge window :-( > > Rafael, please take this patch with my ack in your tree, sorry for noise. > > Acked-by: Kukjin Kim > > If any problems, please kindly let me know. Who is going to pick this patch now for next merge window? -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
On Friday, April 26, 2013 01:48:19 AM Kukjin Kim wrote: > On 04/24/13 07:59, Rafael J. Wysocki wrote: > > [...] > > >> Rafael, please take this patch with my ack in your tree, sorry for noise. > >> > >> Acked-by: Kukjin Kim > >> > >> If any problems, please kindly let me know. > > > > Well, I suppose I can take the original patch, but then it will conflict > > with > > your tree during merge. Is that not a problem? > > > I think, some conflicts can be occurred but if so, we can fix it before > merge window. Well, how exactly would you like to address them? Rafael -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
On 04/24/13 07:59, Rafael J. Wysocki wrote: [...] Rafael, please take this patch with my ack in your tree, sorry for noise. Acked-by: Kukjin Kim If any problems, please kindly let me know. Well, I suppose I can take the original patch, but then it will conflict with your tree during merge. Is that not a problem? I think, some conflicts can be occurred but if so, we can fix it before merge window. - Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
On Wednesday, April 24, 2013 12:25:59 AM Kukjin Kim wrote: > On 04/05/13 20:36, Rafael J. Wysocki wrote: > > On Friday, April 05, 2013 12:36:34 PM Viresh Kumar wrote: > >> On 5 April 2013 12:18, Kukjin Kim wrote: > >>> Basically, this moving looks good to me, but should be re-worked based on > >>> for-next of samsung tree because this touches too many samsung stuff so > >>> this > >>> should be sent to upstream via samsung tree. > >> > >> Hmm... Its already applied in Rafael's tree. But it doesn't mean that > >> it can't be > >> moved to your tree if there is a issue. > > > > Well, I'm dropping it. Please merge via the Samsung tree. > > > > Oops, I missed, maybe I have no more chance to send this to upstream for > upcoming merge window :-( > > Rafael, please take this patch with my ack in your tree, sorry for noise. > > Acked-by: Kukjin Kim > > If any problems, please kindly let me know. Well, I suppose I can take the original patch, but then it will conflict with your tree during merge. Is that not a problem? Rafael -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
On 04/05/13 20:36, Rafael J. Wysocki wrote: On Friday, April 05, 2013 12:36:34 PM Viresh Kumar wrote: On 5 April 2013 12:18, Kukjin Kim wrote: Basically, this moving looks good to me, but should be re-worked based on for-next of samsung tree because this touches too many samsung stuff so this should be sent to upstream via samsung tree. Hmm... Its already applied in Rafael's tree. But it doesn't mean that it can't be moved to your tree if there is a issue. Well, I'm dropping it. Please merge via the Samsung tree. Oops, I missed, maybe I have no more chance to send this to upstream for upcoming merge window :-( Rafael, please take this patch with my ack in your tree, sorry for noise. Acked-by: Kukjin Kim If any problems, please kindly let me know. Thanks. - Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
Rafael J. Wysocki wrote: [...] > > > > > > Well, I'm dropping it. Please merge via the Samsung tree. > > > > > OK, I will. > > > > I got patch file from Viresh, and there is a sign from Rafael, > > but it should be ack. So Rafael, let me use your ack on this patch when > > I apply. If any problems, please let me know. > > Since it was signed-off by me before, you can assume it's been ACKed as > well. > Thanks. - Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
On Monday, April 08, 2013 06:15:09 PM Kukjin Kim wrote: > Rafael J. Wysocki wrote: > > > > On Friday, April 05, 2013 12:36:34 PM Viresh Kumar wrote: > > > On 5 April 2013 12:18, Kukjin Kim wrote: > > > > Basically, this moving looks good to me, but should be re-worked based > > on > > > > for-next of samsung tree because this touches too many samsung stuff > > so this > > > > should be sent to upstream via samsung tree. > > > > > > Hmm... Its already applied in Rafael's tree. But it doesn't mean that > > > it can't be > > > moved to your tree if there is a issue. > > > > Well, I'm dropping it. Please merge via the Samsung tree. > > > OK, I will. > > I got patch file from Viresh, and there is a sign from Rafael, > but it should be ack. So Rafael, let me use your ack on this patch when > I apply. If any problems, please let me know. Since it was signed-off by me before, you can assume it's been ACKed as well. Thanks, Rafael -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
On 8 April 2013 14:45, Kukjin Kim wrote: > Rafael J. Wysocki wrote: >> Well, I'm dropping it. Please merge via the Samsung tree. >> > OK, I will. > > I got patch file from Viresh, and there is a sign from Rafael, but it should > be ack. So Rafael, let me use your ack on this patch when I apply. If any > problems, please let me know. Ahh.. I forgot to remove it. I picked the initial patch from Rafael's tree. But yes, you need it anyway :) -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
Rafael J. Wysocki wrote: > > On Friday, April 05, 2013 12:36:34 PM Viresh Kumar wrote: > > On 5 April 2013 12:18, Kukjin Kim wrote: > > > Basically, this moving looks good to me, but should be re-worked based > on > > > for-next of samsung tree because this touches too many samsung stuff > so this > > > should be sent to upstream via samsung tree. > > > > Hmm... Its already applied in Rafael's tree. But it doesn't mean that > > it can't be > > moved to your tree if there is a issue. > > Well, I'm dropping it. Please merge via the Samsung tree. > OK, I will. I got patch file from Viresh, and there is a sign from Rafael, but it should be ack. So Rafael, let me use your ack on this patch when I apply. If any problems, please let me know. Thanks. - Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
On 5 April 2013 12:36, Viresh Kumar wrote: > On 5 April 2013 12:18, Kukjin Kim wrote: >> Basically, this moving looks good to me, but should be re-worked based on >> for-next of samsung tree because this touches too many samsung stuff so this >> should be sent to upstream via samsung tree. > > Hmm... Its already applied in Rafael's tree. But it doesn't mean that > it can't be > moved to your tree if there is a issue. > > What tree/branch? I used: > > git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git for-next > >> Applying: cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq >> error: patch failed: arch/arm/Kconfig:2166 >> error: arch/arm/Kconfig: patch does not apply > > above two are obvious as you haven't applied other patches in this series. > >> error: patch failed: arch/arm/mach-s3c24xx/Kconfig:28 >> error: arch/arm/mach-s3c24xx/Kconfig: patch does not apply >> error: patch failed: arch/arm/mach-s3c24xx/Makefile:17 >> error: arch/arm/mach-s3c24xx/Makefile: patch does not apply >> error: patch failed: drivers/cpufreq/Makefile:63 >> error: drivers/cpufreq/Makefile: patch does not apply > > Same here. > >> error: drivers/cpufreq/s3c2412-cpufreq.c: does not exist in index > > I can still see it in for-next. > > Attached is my patch based of your for-next Kukjin, As Rafael has already dropped it, can you apply it at your end and make sure it doesn't miss the merge cycle? -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
On Friday, April 05, 2013 12:36:34 PM Viresh Kumar wrote: > On 5 April 2013 12:18, Kukjin Kim wrote: > > Basically, this moving looks good to me, but should be re-worked based on > > for-next of samsung tree because this touches too many samsung stuff so this > > should be sent to upstream via samsung tree. > > Hmm... Its already applied in Rafael's tree. But it doesn't mean that > it can't be > moved to your tree if there is a issue. Well, I'm dropping it. Please merge via the Samsung tree. Thanks, Rafael -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
On 5 April 2013 12:18, Kukjin Kim wrote: > Basically, this moving looks good to me, but should be re-worked based on > for-next of samsung tree because this touches too many samsung stuff so this > should be sent to upstream via samsung tree. Hmm... Its already applied in Rafael's tree. But it doesn't mean that it can't be moved to your tree if there is a issue. What tree/branch? I used: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git for-next > Applying: cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq > error: patch failed: arch/arm/Kconfig:2166 > error: arch/arm/Kconfig: patch does not apply above two are obvious as you haven't applied other patches in this series. > error: patch failed: arch/arm/mach-s3c24xx/Kconfig:28 > error: arch/arm/mach-s3c24xx/Kconfig: patch does not apply > error: patch failed: arch/arm/mach-s3c24xx/Makefile:17 > error: arch/arm/mach-s3c24xx/Makefile: patch does not apply > error: patch failed: drivers/cpufreq/Makefile:63 > error: drivers/cpufreq/Makefile: patch does not apply Same here. > error: drivers/cpufreq/s3c2412-cpufreq.c: does not exist in index I can still see it in for-next. Attached is my patch based of your for-next 0001-cpufreq-s3c24xx-move-cpufreq-driver-to-drivers-cpufr.patch Description: Binary data
RE: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
Viresh Kumar wrote:
>
> This patch moves cpufreq driver of Samsung's ARM based s3c24xx platform to
> drivers/cpufreq.
>
> Cc: Ben Dooks
> Cc: Kukjin Kim
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: linux-arm-ker...@lists.infradead.org
> Signed-off-by: Viresh Kumar
> Acked-by: Arnd Bergmann
> ---
> arch/arm/Kconfig | 46 ---
> arch/arm/mach-s3c24xx/Kconfig | 66
+-
> arch/arm/mach-s3c24xx/Makefile | 6 --
> arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h | 0
> arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 2 +-
> arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 10 ++--
> arch/arm/plat-samsung/include/plat/cpu-freq.h | 6 +-
> drivers/cpufreq/Kconfig.arm| 58
+++
> drivers/cpufreq/Makefile | 5 ++
> .../cpufreq/s3c2410-cpufreq.c | 0
> .../cpufreq/s3c2412-cpufreq.c | 3 +-
> .../cpufreq/s3c2440-cpufreq.c | 0
> .../cpufreq/s3c24xx-cpufreq-debugfs.c | 0
> .../cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c | 0
> 14 files changed, 100 insertions(+), 102 deletions(-)
> rename arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h (100%)
> rename arch/arm/mach-s3c24xx/cpufreq-s3c2410.c =>
> drivers/cpufreq/s3c2410-cpufreq.c (100%)
> rename arch/arm/mach-s3c24xx/cpufreq-s3c2412.c =>
> drivers/cpufreq/s3c2412-cpufreq.c (99%)
> rename arch/arm/mach-s3c24xx/cpufreq-s3c2440.c =>
> drivers/cpufreq/s3c2440-cpufreq.c (100%)
> rename arch/arm/mach-s3c24xx/cpufreq-debugfs.c =>
> drivers/cpufreq/s3c24xx-cpufreq-debugfs.c (100%)
> rename arch/arm/mach-s3c24xx/cpufreq.c => drivers/cpufreq/s3c24xx-
> cpufreq.c (100%)
>
Basically, this moving looks good to me, but should be re-worked based on
for-next of samsung tree because this touches too many samsung stuff so this
should be sent to upstream via samsung tree.
See below,
Applying: cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
error: patch failed: arch/arm/Kconfig:2166
error: arch/arm/Kconfig: patch does not apply
error: patch failed: arch/arm/mach-s3c24xx/Kconfig:28
error: arch/arm/mach-s3c24xx/Kconfig: patch does not apply
error: patch failed: arch/arm/mach-s3c24xx/Makefile:17
error: arch/arm/mach-s3c24xx/Makefile: patch does not apply
error: patch failed: drivers/cpufreq/Makefile:63
error: drivers/cpufreq/Makefile: patch does not apply
error: drivers/cpufreq/s3c2412-cpufreq.c: does not exist in index
Patch failed at 0001 cpufreq: s3c24xx: move cpufreq driver to
drivers/cpufreq
Thanks.
- Kukjin
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
