From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: Kevin Hilman <khilman@linaro.org>
Cc: Tony Lindgren <tony@atomide.com>, Arnd Bergmann <arnd@arndb.de>,
Olof Johansson <olof@lixom.net>,
linux-omap@vger.kernel.org,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL 2/5] omap pm clean-up for v3.10 merge window
Date: Tue, 09 Apr 2013 23:03:55 +0200 [thread overview]
Message-ID: <5164823B.8070301@linaro.org> (raw)
In-Reply-To: <874nffip2d.fsf@linaro.org>
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
WARNING: multiple messages have this Message-ID (diff)
From: daniel.lezcano@linaro.org (Daniel Lezcano)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 2/5] omap pm clean-up for v3.10 merge window
Date: Tue, 09 Apr 2013 23:03:55 +0200 [thread overview]
Message-ID: <5164823B.8070301@linaro.org> (raw)
In-Reply-To: <874nffip2d.fsf@linaro.org>
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
next prev parent reply other threads:[~2013-04-09 21:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[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 14:52 ` Arnd Bergmann
2013-04-09 16:38 ` Kevin Hilman
2013-04-09 16:38 ` Kevin Hilman
2013-04-09 16:56 ` Tony Lindgren
2013-04-09 16:56 ` Tony Lindgren
2013-04-09 17:36 ` Kevin Hilman
2013-04-09 17:36 ` Kevin Hilman
2013-04-09 21:03 ` Daniel Lezcano [this message]
2013-04-09 21:03 ` Daniel Lezcano
2013-04-09 21:47 ` Kevin Hilman
2013-04-09 21:47 ` Kevin Hilman
2013-04-09 21:52 ` Daniel Lezcano
2013-04-09 21:52 ` Daniel Lezcano
2013-04-09 4:51 [GIT PULL 1/5] omap pm fixes " Tony Lindgren
2013-04-09 4:51 ` [GIT PULL 2/5] omap pm clean-up " Tony Lindgren
2013-04-09 4:51 ` Tony Lindgren
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=5164823B.8070301@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=arnd@arndb.de \
--cc=khilman@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=olof@lixom.net \
--cc=rafael.j.wysocki@intel.com \
--cc=tony@atomide.com \
/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.