Patchwork [GIT,PULL] imx fixes for v3.5-rc (part 2)

login
register
mail settings
Submitter Shawn Guo
Date June 11, 2012, 4:47 a.m.
Message ID <CAAQ0ZWQ1D38onzk0aMaCTEQ-NSyCgEEUNwK3PfWbE2VUSG2ckQ@mail.gmail.com>
Download mbox
Permalink /patch/164117/
State New
Headers show

Pull-request

git://git.linaro.org/people/shawnguo/linux-2.6.git imx/fixes-for-3.5

Comments

Shawn Guo - June 11, 2012, 4:47 a.m.
Hi Arnd, Olof,

Here are a couple of imx6q clk patches missed from Sascha's
imx-common-clk-fixes pull-request.  So I rebase them on arm-soc/fixes
(they depends on one patch in Sascha's pull-request) and send them
here.  Please pull.  Thanks.

Regards,
Shawn

The following changes since commit f9c15a1b7d60b69f42b2808140a4713808a3bec1:

  Merge tag 'omap-fixes-for-v3.5-rc1' of
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into
fixes (2012-06-08 00:43:39 -0700)

are available in the git repository at:

  git://git.linaro.org/people/shawnguo/linux-2.6.git imx/fixes-for-3.5

Shawn Guo (2):
      ARM: imx6q: remove unneeded clkdev lookups
      ARM: imx6q: fix suspend regression caused by common clk migration

 arch/arm/mach-imx/clk-imx6q.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
Olof Johansson - June 11, 2012, 4:44 p.m.
Hi,

On Sun, Jun 10, 2012 at 9:47 PM, Shawn Guo <shawn.guo@linaro.org> wrote:
> Hi Arnd, Olof,
>
> Here are a couple of imx6q clk patches missed from Sascha's
> imx-common-clk-fixes pull-request.  So I rebase them on arm-soc/fixes
> (they depends on one patch in Sascha's pull-request) and send them
> here.  Please pull.  Thanks.
>
> Regards,
> Shawn
>
> The following changes since commit f9c15a1b7d60b69f42b2808140a4713808a3bec1:
>
>  Merge tag 'omap-fixes-for-v3.5-rc1' of
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into
> fixes (2012-06-08 00:43:39 -0700)
>
> are available in the git repository at:
>
>  git://git.linaro.org/people/shawnguo/linux-2.6.git imx/fixes-for-3.5
>
> Shawn Guo (2):
>      ARM: imx6q: remove unneeded clkdev lookups

This is looking more like a cleanup, if it is, please hold off until
3.6. If it isn't please explain in the commit message what bug it
fixes.


Thanks!

-Olof
Shawn Guo - June 12, 2012, 1:16 a.m.
On Mon, Jun 11, 2012 at 09:44:41AM -0700, Olof Johansson wrote:
> > Shawn Guo (2):
> >      ARM: imx6q: remove unneeded clkdev lookups
> 
> This is looking more like a cleanup, if it is, please hold off until
> 3.6. If it isn't please explain in the commit message what bug it
> fixes.
> 
Yes, it is a cleanup.  It cleans up some left-over from commit b0286f2
(ARM: imx6q: prepare and enable init on clks directly instead of
clk_get first) which is currently sitting on arm-soc/fixes.  I
originally sent the patch to Sascha and somehow expect him amend the
patch to that commit.  Anyway, it does not really matter, and we can
have it held off until 3.6.
Shawn Guo - June 28, 2012, 9:09 a.m.
Hi Olof,

On Mon, Jun 11, 2012 at 12:47:15PM +0800, Shawn Guo wrote:
> Shawn Guo (2):
>       ARM: imx6q: remove unneeded clkdev lookups

We agreed that this one is actually a cleanup and can be held off
until 3.6 ...

>       ARM: imx6q: fix suspend regression caused by common clk migration

... but this is one is indeed a fix, which seems missed from your
pull-request to Linus.
Olof Johansson - June 30, 2012, 10:26 p.m.
Hi,

On Thu, Jun 28, 2012 at 2:09 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> Hi Olof,
>
> On Mon, Jun 11, 2012 at 12:47:15PM +0800, Shawn Guo wrote:
>> Shawn Guo (2):
>>       ARM: imx6q: remove unneeded clkdev lookups
>
> We agreed that this one is actually a cleanup and can be held off
> until 3.6 ...
>
>>       ARM: imx6q: fix suspend regression caused by common clk migration
>
> ... but this is one is indeed a fix, which seems missed from your
> pull-request to Linus.

Hi,

Yes, given that the branch had contents that wasn't suitable for
3.5-rc I didn't pull it. In the past, most maintainers will rebuild
the branch and send a fresh pull request.

I cherry-picked the patch above into our fixes branch now -- it sounds
like that's what you expected me to do this time? In the future,
please do send a refreshed pull request in this situations if you
don't mind (or be explicit if you want me to cherry-pick).


Thanks,


-Olof
Shawn Guo - June 30, 2012, 11:44 p.m.
On 1 July 2012 06:26, Olof Johansson <olof@lixom.net> wrote:
> I cherry-picked the patch above into our fixes branch now -- it sounds
> like that's what you expected me to do this time? In the future,
> please do send a refreshed pull request in this situations if you
> don't mind (or be explicit if you want me to cherry-pick).
>
Ok, got it.  Thanks.

Regards,
Shawn