From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Hilman Subject: Re: [GIT PULL 2/5] omap pm clean-up for v3.10 merge window Date: Tue, 09 Apr 2013 10:36:26 -0700 Message-ID: <874nffip2d.fsf@linaro.org> References: <0MarPy-1U9XGk2D8s-00Ks1o@mx.kundenserver.de> <201304091652.28385.arnd@arndb.de> <87vc7virqz.fsf@linaro.org> <20130409165633.GN10155@atomide.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from mail-pa0-f49.google.com ([209.85.220.49]:53737 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932140Ab3DIRg3 (ORCPT ); Tue, 9 Apr 2013 13:36:29 -0400 Received: by mail-pa0-f49.google.com with SMTP id kp14so3931677pab.36 for ; Tue, 09 Apr 2013 10:36:29 -0700 (PDT) In-Reply-To: <20130409165633.GN10155@atomide.com> (Tony Lindgren's message of "Tue, 9 Apr 2013 09:56:33 -0700") Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Tony Lindgren Cc: Arnd Bergmann , Olof Johansson , linux-omap@vger.kernel.org, "Rafael J. Wysocki" , Daniel Lezcano , linux-arm-kernel@lists.infradead.org Tony Lindgren writes: > * Kevin Hilman [130409 09:43]: >> Arnd Bergmann 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 : >> >> >> >> 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: khilman@linaro.org (Kevin Hilman) Date: Tue, 09 Apr 2013 10:36:26 -0700 Subject: [GIT PULL 2/5] omap pm clean-up for v3.10 merge window In-Reply-To: <20130409165633.GN10155@atomide.com> (Tony Lindgren's message of "Tue, 9 Apr 2013 09:56:33 -0700") References: <0MarPy-1U9XGk2D8s-00Ks1o@mx.kundenserver.de> <201304091652.28385.arnd@arndb.de> <87vc7virqz.fsf@linaro.org> <20130409165633.GN10155@atomide.com> Message-ID: <874nffip2d.fsf@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Tony Lindgren writes: > * Kevin Hilman [130409 09:43]: >> Arnd Bergmann 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 : >> >> >> >> 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