* Re: [GIT PULL 2/5] omap pm clean-up for v3.10 merge window [not found] <0MarPy-1U9XGk2D8s-00Ks1o@mx.kundenserver.de> @ 2013-04-09 14:52 ` Arnd Bergmann 2013-04-09 16:38 ` Kevin Hilman 0 siblings, 1 reply; 8+ messages in thread From: Arnd Bergmann @ 2013-04-09 14:52 UTC (permalink / raw) To: Tony Lindgren Cc: Olof Johansson, linux-omap, Rafael J. Wysocki, Daniel Lezcano, linux-arm-kernel On Tuesday 09 April 2013, Tony Lindgren wrote: > The following changes since commit 07961ac7c0ee8b546658717034fe692fd12eefa9: > > Linux 3.9-rc5 (2013-03-31 15:12:43 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/cleanup-pm-signed > > for you to fetch changes up to ca8cdff548da76da01f3783548ceb917139a5ddc: > > Merge tag 'omap-pm-v3.10/cleanup/cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.10/cleanup-pm (2013-04-08 09:51:00 -0700) > > ---------------------------------------------------------------- > > PM cleanup to prepare for omap5 PM via Kevin Hilman <khilman@linaro.org>: > > OMAP3/4 CPUidle cleanups for v3.10 Adding Daniel and Rafael to Cc. Is this series coordinated with the other cpuidle changes? Please tell me if this is good to go into arm-soc. Arnd > ---------------------------------------------------------------- > Daniel Lezcano (1): > ARM: omap3: cpuidle: enable time keeping > > Santosh Shilimkar (5): > ARM: OMAP4: CPUidle: Avoid double idle driver registration > ARM: OMAP: CPUidle: Unregister drivere on device registration failure > ARM: OMAP4: CPUidle: Make C-state description field more precise > ARM: OMAP4+: CPUidle: Deprecate use of omap4_mpuss_read_prev_context_state() > ARM: OMAP4+: CPUidle: Consolidate idle driver for OMAP5 support > > Tony Lindgren (1): > Merge tag 'omap-pm-v3.10/cleanup/cpuidle' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.10/cleanup-pm > > arch/arm/mach-omap2/common.h | 5 ---- > arch/arm/mach-omap2/cpuidle34xx.c | 11 +++++-- > arch/arm/mach-omap2/cpuidle44xx.c | 48 +++++++++++++++++-------------- > arch/arm/mach-omap2/omap-mpuss-lowpower.c | 14 --------- > 4 files changed, 35 insertions(+), 43 deletions(-) > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [GIT PULL 2/5] omap pm clean-up for v3.10 merge window 2013-04-09 14:52 ` [GIT PULL 2/5] omap pm clean-up for v3.10 merge window Arnd Bergmann @ 2013-04-09 16:38 ` Kevin Hilman 2013-04-09 16:56 ` Tony Lindgren 0 siblings, 1 reply; 8+ messages in thread From: Kevin Hilman @ 2013-04-09 16:38 UTC (permalink / raw) To: Arnd Bergmann Cc: Tony Lindgren, Olof Johansson, linux-omap, Rafael J. Wysocki, Daniel Lezcano, linux-arm-kernel Arnd Bergmann <arnd@arndb.de> writes: > On Tuesday 09 April 2013, Tony Lindgren wrote: >> The following changes since commit 07961ac7c0ee8b546658717034fe692fd12eefa9: >> >> Linux 3.9-rc5 (2013-03-31 15:12:43 -0700) >> >> are available in the git repository at: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/cleanup-pm-signed >> >> for you to fetch changes up to ca8cdff548da76da01f3783548ceb917139a5ddc: >> >> Merge tag 'omap-pm-v3.10/cleanup/cpuidle' of >> git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm >> into omap-for-v3.10/cleanup-pm (2013-04-08 09:51:00 -0700) >> >> ---------------------------------------------------------------- >> >> PM cleanup to prepare for omap5 PM via Kevin Hilman <khilman@linaro.org>: >> >> OMAP3/4 CPUidle cleanups for v3.10 > > Adding Daniel and Rafael to Cc. > > Is this series coordinated with the other cpuidle changes? Please tell me if this > is good to go into arm-soc. Hmm, looks like it's not ready. There are some minor conflicts with what Rafael has queued up from Daniel. I will work this out with Daniel to figure out how we should proceed. Kevin ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [GIT PULL 2/5] omap pm clean-up for v3.10 merge window 2013-04-09 16:38 ` Kevin Hilman @ 2013-04-09 16:56 ` Tony Lindgren 2013-04-09 17:36 ` Kevin Hilman 0 siblings, 1 reply; 8+ messages in thread From: Tony Lindgren @ 2013-04-09 16:56 UTC (permalink / raw) To: Kevin Hilman Cc: Arnd Bergmann, Olof Johansson, linux-omap, Rafael J. Wysocki, Daniel Lezcano, linux-arm-kernel * Kevin Hilman <khilman@linaro.org> [130409 09:43]: > Arnd Bergmann <arnd@arndb.de> writes: > > > On Tuesday 09 April 2013, Tony Lindgren wrote: > >> The following changes since commit 07961ac7c0ee8b546658717034fe692fd12eefa9: > >> > >> Linux 3.9-rc5 (2013-03-31 15:12:43 -0700) > >> > >> are available in the git repository at: > >> > >> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/cleanup-pm-signed > >> > >> for you to fetch changes up to ca8cdff548da76da01f3783548ceb917139a5ddc: > >> > >> Merge tag 'omap-pm-v3.10/cleanup/cpuidle' of > >> git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm > >> into omap-for-v3.10/cleanup-pm (2013-04-08 09:51:00 -0700) > >> > >> ---------------------------------------------------------------- > >> > >> PM cleanup to prepare for omap5 PM via Kevin Hilman <khilman@linaro.org>: > >> > >> OMAP3/4 CPUidle cleanups for v3.10 > > > > Adding Daniel and Rafael to Cc. > > > > Is this series coordinated with the other cpuidle changes? Please tell me if this > > is good to go into arm-soc. > > Hmm, looks like it's not ready. There are some minor conflicts with > what Rafael has queued up from Daniel. > > I will work this out with Daniel to figure out how we should proceed. OK it seems that this branch can also be queued by Rafael after updating it if there's a dependency. So far it's not conflicting with anything else we have queued up for arm soc tree. Regards, Tony ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [GIT PULL 2/5] omap pm clean-up for v3.10 merge window 2013-04-09 16:56 ` Tony Lindgren @ 2013-04-09 17:36 ` Kevin Hilman 2013-04-09 21:03 ` Daniel Lezcano 0 siblings, 1 reply; 8+ messages in thread From: Kevin Hilman @ 2013-04-09 17:36 UTC (permalink / raw) To: Tony Lindgren Cc: Arnd Bergmann, Olof Johansson, linux-omap, Rafael J. Wysocki, Daniel Lezcano, linux-arm-kernel Tony Lindgren <tony@atomide.com> writes: > * Kevin Hilman <khilman@linaro.org> [130409 09:43]: >> Arnd Bergmann <arnd@arndb.de> writes: >> >> > On Tuesday 09 April 2013, Tony Lindgren wrote: >> >> The following changes since commit 07961ac7c0ee8b546658717034fe692fd12eefa9: >> >> >> >> Linux 3.9-rc5 (2013-03-31 15:12:43 -0700) >> >> >> >> are available in the git repository at: >> >> >> >> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/cleanup-pm-signed >> >> >> >> for you to fetch changes up to ca8cdff548da76da01f3783548ceb917139a5ddc: >> >> >> >> Merge tag 'omap-pm-v3.10/cleanup/cpuidle' of >> >> git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm >> >> into omap-for-v3.10/cleanup-pm (2013-04-08 09:51:00 -0700) >> >> >> >> ---------------------------------------------------------------- >> >> >> >> PM cleanup to prepare for omap5 PM via Kevin Hilman <khilman@linaro.org>: >> >> >> >> OMAP3/4 CPUidle cleanups for v3.10 >> > >> > Adding Daniel and Rafael to Cc. >> > >> > Is this series coordinated with the other cpuidle changes? Please tell me if this >> > is good to go into arm-soc. >> >> Hmm, looks like it's not ready. There are some minor conflicts with >> what Rafael has queued up from Daniel. >> >> I will work this out with Daniel to figure out how we should proceed. > > OK it seems that this branch can also be queued by Rafael after > updating it if there's a dependency. So far it's not conflicting > with anything else we have queued up for arm soc tree. Right, I just did a test rebase onto the relevant commit in Rafael linux-next branch, and fixed up all the conflicts[1]. If Rafael agrees, it's fine with me if it goes via him. Rafael, the signed tag for the updated branch is below[1], based on the commit in your linux-next branch where you merged the rest of the CPUidle changes. Let me know if you want a different base commit, or an official pull request. Kevin [1] git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git tags/omap-pm-v3.10/cleanup/cpuidle-v2 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [GIT PULL 2/5] omap pm clean-up for v3.10 merge window 2013-04-09 17:36 ` Kevin Hilman @ 2013-04-09 21:03 ` Daniel Lezcano 2013-04-09 21:47 ` Kevin Hilman 0 siblings, 1 reply; 8+ messages in thread From: Daniel Lezcano @ 2013-04-09 21:03 UTC (permalink / raw) To: Kevin Hilman Cc: Tony Lindgren, Arnd Bergmann, Olof Johansson, linux-omap, Rafael J. Wysocki, linux-arm-kernel On 04/09/2013 07:36 PM, Kevin Hilman wrote: > Tony Lindgren <tony@atomide.com> writes: > >> * Kevin Hilman <khilman@linaro.org> [130409 09:43]: >>> Arnd Bergmann <arnd@arndb.de> writes: >>> >>>> On Tuesday 09 April 2013, Tony Lindgren wrote: >>>>> The following changes since commit 07961ac7c0ee8b546658717034fe692fd12eefa9: >>>>> >>>>> Linux 3.9-rc5 (2013-03-31 15:12:43 -0700) >>>>> >>>>> are available in the git repository at: >>>>> >>>>> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/cleanup-pm-signed >>>>> >>>>> for you to fetch changes up to ca8cdff548da76da01f3783548ceb917139a5ddc: >>>>> >>>>> Merge tag 'omap-pm-v3.10/cleanup/cpuidle' of >>>>> git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm >>>>> into omap-for-v3.10/cleanup-pm (2013-04-08 09:51:00 -0700) >>>>> >>>>> ---------------------------------------------------------------- >>>>> >>>>> PM cleanup to prepare for omap5 PM via Kevin Hilman <khilman@linaro.org>: >>>>> >>>>> OMAP3/4 CPUidle cleanups for v3.10 >>>> >>>> Adding Daniel and Rafael to Cc. Kevin, I just want to point you this patch: https://git.linaro.org/gitweb?p=people/dlezcano/cpuidle-next.git;a=commit;h=e03a37fdf942a25154ccb5539524afd336f130bb I did not yet send it to Rafael. >>>> Is this series coordinated with the other cpuidle changes? Please tell me if this >>>> is good to go into arm-soc. >>> >>> Hmm, looks like it's not ready. There are some minor conflicts with >>> what Rafael has queued up from Daniel. >>> >>> I will work this out with Daniel to figure out how we should proceed. >> >> OK it seems that this branch can also be queued by Rafael after >> updating it if there's a dependency. So far it's not conflicting >> with anything else we have queued up for arm soc tree. > > Right, I just did a test rebase onto the relevant commit in Rafael > linux-next branch, and fixed up all the conflicts[1]. > > If Rafael agrees, it's fine with me if it goes via him. > > Rafael, the signed tag for the updated branch is below[1], based on the > commit in your linux-next branch where you merged the rest of the > CPUidle changes. Let me know if you want a different base commit, or an > official pull request. > > Kevin > > [1] git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git tags/omap-pm-v3.10/cleanup/cpuidle-v2 -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [GIT PULL 2/5] omap pm clean-up for v3.10 merge window 2013-04-09 21:03 ` Daniel Lezcano @ 2013-04-09 21:47 ` Kevin Hilman 2013-04-09 21:52 ` Daniel Lezcano 0 siblings, 1 reply; 8+ messages in thread From: Kevin Hilman @ 2013-04-09 21:47 UTC (permalink / raw) To: Daniel Lezcano Cc: Tony Lindgren, Arnd Bergmann, Olof Johansson, linux-omap, Rafael J. Wysocki, linux-arm-kernel Daniel Lezcano <daniel.lezcano@linaro.org> writes: [...] >>>>>> >>>>>> PM cleanup to prepare for omap5 PM via Kevin Hilman <khilman@linaro.org>: >>>>>> >>>>>> OMAP3/4 CPUidle cleanups for v3.10 >>>>> >>>>> Adding Daniel and Rafael to Cc. > > Kevin, > > I just want to point you this patch: > > https://git.linaro.org/gitweb?p=people/dlezcano/cpuidle-next.git;a=commit;h=e03a37fdf942a25154ccb5539524afd336f130bb > > I did not yet send it to Rafael. I haven't seen that one posted anywhere so it's not in my queue, and probably too late for v3.10. Once it's posted, I'll queue it up, and we can maybe get it in for v3.10-rc. Kevin ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [GIT PULL 2/5] omap pm clean-up for v3.10 merge window 2013-04-09 21:47 ` Kevin Hilman @ 2013-04-09 21:52 ` Daniel Lezcano 0 siblings, 0 replies; 8+ messages in thread From: Daniel Lezcano @ 2013-04-09 21:52 UTC (permalink / raw) To: Kevin Hilman Cc: Tony Lindgren, Arnd Bergmann, Olof Johansson, linux-omap, Rafael J. Wysocki, linux-arm-kernel On 04/09/2013 11:47 PM, Kevin Hilman wrote: > Daniel Lezcano <daniel.lezcano@linaro.org> writes: > > [...] > >>>>>>> >>>>>>> PM cleanup to prepare for omap5 PM via Kevin Hilman <khilman@linaro.org>: >>>>>>> >>>>>>> OMAP3/4 CPUidle cleanups for v3.10 >>>>>> >>>>>> Adding Daniel and Rafael to Cc. >> >> Kevin, >> >> I just want to point you this patch: >> >> https://git.linaro.org/gitweb?p=people/dlezcano/cpuidle-next.git;a=commit;h=e03a37fdf942a25154ccb5539524afd336f130bb >> >> I did not yet send it to Rafael. > > I haven't seen that one posted anywhere so it's not in my queue, and > probably too late for v3.10. > > Once it's posted, I'll queue it up, and we can maybe get it in for > v3.10-rc. Yes, I just did the fix very recently. It was just a head up. I will send it to Rafael as soon as the 'bleeding edge' branch is merged with 'linux-next'. -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <pull-1365483063-475562>]
* [GIT PULL 2/5] omap pm clean-up for v3.10 merge window [not found] <pull-1365483063-475562> @ 2013-04-09 4:51 ` Tony Lindgren 0 siblings, 0 replies; 8+ messages in thread From: Tony Lindgren @ 2013-04-09 4:51 UTC (permalink / raw) To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel The following changes since commit 07961ac7c0ee8b546658717034fe692fd12eefa9: Linux 3.9-rc5 (2013-03-31 15:12:43 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.10/cleanup-pm-signed for you to fetch changes up to ca8cdff548da76da01f3783548ceb917139a5ddc: Merge tag 'omap-pm-v3.10/cleanup/cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.10/cleanup-pm (2013-04-08 09:51:00 -0700) ---------------------------------------------------------------- PM cleanup to prepare for omap5 PM via Kevin Hilman <khilman@linaro.org>: OMAP3/4 CPUidle cleanups for v3.10 ---------------------------------------------------------------- Daniel Lezcano (1): ARM: omap3: cpuidle: enable time keeping Santosh Shilimkar (5): ARM: OMAP4: CPUidle: Avoid double idle driver registration ARM: OMAP: CPUidle: Unregister drivere on device registration failure ARM: OMAP4: CPUidle: Make C-state description field more precise ARM: OMAP4+: CPUidle: Deprecate use of omap4_mpuss_read_prev_context_state() ARM: OMAP4+: CPUidle: Consolidate idle driver for OMAP5 support Tony Lindgren (1): Merge tag 'omap-pm-v3.10/cleanup/cpuidle' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.10/cleanup-pm arch/arm/mach-omap2/common.h | 5 ---- arch/arm/mach-omap2/cpuidle34xx.c | 11 +++++-- arch/arm/mach-omap2/cpuidle44xx.c | 48 +++++++++++++++++-------------- arch/arm/mach-omap2/omap-mpuss-lowpower.c | 14 --------- 4 files changed, 35 insertions(+), 43 deletions(-) ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-04-09 21:52 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <0MarPy-1U9XGk2D8s-00Ks1o@mx.kundenserver.de>
2013-04-09 14:52 ` [GIT PULL 2/5] omap pm clean-up for v3.10 merge window Arnd Bergmann
2013-04-09 16:38 ` Kevin Hilman
2013-04-09 16:56 ` Tony Lindgren
2013-04-09 17:36 ` Kevin Hilman
2013-04-09 21:03 ` Daniel Lezcano
2013-04-09 21:47 ` Kevin Hilman
2013-04-09 21:52 ` Daniel Lezcano
[not found] <pull-1365483063-475562>
2013-04-09 4:51 ` Tony Lindgren
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).