On Thu, Aug 26, 2010 at 2:30 PM, Yong Shen <yong.shen@linaro.org> wrote:

Hi Nicolas,

Thanks for your suggestion.s I am going to follow this.

Yong

On Thu, Aug 26, 2010 at 3:05 AM, Nicolas Pitre <nicolas.pitre@linaro.org> wrote:

Those patches don't apply as is, and I prefer not venturing into merge
conflict attempts.

What I'd suggest is:

1) get the stable linaro tree from git://git.linaro.org/kernel/linux-linaro-2.6.35.git

2) cherry-pick the upstream patch with 'git cherry-pick -x 8d4b9d1bf'

3) fix the conflicts, then commit

4) apply and commit the other patches on top

5) test _this_ resulting tree

6) put the result somewhere for me to pull.

On Wed, 25 Aug 2010, Amit Kucheria wrote:

> Hi John/Yong,
>
> Could you work with the Ubuntu kernel team to get these patches merged
> into their tree?
>
> Regards,
> Amit
>
> On Mon, Aug 23, 2010 at 6:25 AM, Yong Shen <yong.shen@linaro.org> wrote:
> > only one patch, linux-2.6.35-rc4-annotate-device-pm.patch is involved in
> > 2.6.36, at 8d4b9d1bfef117862a2889dec4dac227068544c9.
> > So we may still need the rest two.
> >
> > On Sat, Aug 21, 2010 at 2:28 AM, Nicolas Pitre <nicolas.pitre@linaro.org>
> > wrote:
> >>
> >> On Fri, 20 Aug 2010, Yong Shen wrote:
> >>
> >> > Hi there,
> >> >
> >> > Power management WG is invistigating on a tool named PowerTOP, which can
> >> > spit out real time data on various aspects of a running system, in terms
> >> > of
> >> > power related information.
> >> > However, occasionally some PowerTOP features need kernel patch. We'd
> >> > like
> >> > users to be able to use these latest features without having to wait up
> >> > to 3
> >> > months for Linus to make a release with the kernel portion -- as the
> >> > original patch developer(s) said.
> >> > There are totally 3 patches which I had already enclosed them in the
> >> > attachment. Except vfs.patch, the rest two are original and can be
> >> > applied
> >> > on linaro kernel without any changes. vfs.patch is changed a little from
> >> > original one to adapt current linaro kernel.
> >> > Hope John would give it a thought to merge these patch in Linaro kernel.
> >>
> >> I would be interested in them too!
> >>
> >> If I'm not mistaken, John is getting my kernel and adding the necessary
> >> packaging to it. So those patches would probably make more sense being
> >> carried into the base Linaro repository that John is using.
> >>
> >>
> >> Nicolas
> >
> >
> > _______________________________________________
> > linaro-dev mailing list
> > linaro-dev@lists.linaro.org
> > http://lists.linaro.org/mailman/listinfo/linaro-dev
> >
> >
>