Re: thermal patches in linux-next
From: Zhang Rui
Date: Fri Aug 10 2012 - 01:50:38 EST
On ä, 2012-08-10 at 10:37 +0530, Amit Kachhap wrote:
> On 10 August 2012 08:14, Zhang Rui <rui.zhang@xxxxxxxxx> wrote:
> > On ä, 2012-08-10 at 12:23 +1000, Stephen Rothwell wrote:
> >> Hi Rui,
> >>
> >> On Fri, 10 Aug 2012 09:41:06 +0800 Zhang Rui <rui.zhang@xxxxxxxxx> wrote:
> >> >
> >> > > > And could you please drop these commits
> >> > > > ef25a0fe0087963c1611c1c8903886fbea053f76
> >> > > > 09ec52fca274ba88d68df3198de92abdaaff417b
> >> > > > ab6d2f029358c917508bf88bbd6a9193a8e39fc8
> >> > > > 66447fa993cbce56b4076f169a56f62350f6c7b8
> >> > > > ec62abb8b46021ca9ee6b8692b26974ace9007f0
> >> > > > 5ecbaf57d7885eedd924e391d91847d3df9fe0f8
> >> > > > 851414b2249afd8c128d29912dfd7060eaea8932
> >> > > > and pull my next branch instead?
> >> > >
> >> > > That is not how linux-next normally works. Those commits are in Adnrew's
> >> > > quilt series, so you need to ask him to drop them. However, because of
> >> > > the way the akpm tree works, any duplicate patches will disappear from my
> >> > > copy of Andrew's series.
> >> >
> >> > could you please drop these patches?
> >> > these commits either will be or has been re-based on top of my tree.
> >>
> >> You should always quote the summary line of commits. Andrew is using
> >> quilt to manage his patches and so those commit ids mean nothing to him
> >> (and they have changed in today's linux-next anyway).
> >>
> > got it.
> >
> > Andrew,
> > could you please drop these patches from Amit for now?
> >
> > ARM: exynos: add thermal sensor driver platform data support
> > thermal: exynos: register the tmu sensor with the kernel thermal layer
> > thermal: exynos5: add exynos5 thermal sensor driver support
> > hwmon: exynos4: move thermal sensor driver to driver/thermal directory
> > thermal: add generic cpufreq cooling implementation
> >
> > these patches can not build because of the recent thermal changes, and
> > Amit agreed with me to re-base them on top of my tree.
>
> Or may be it is better to let them be in linux-next as it is and I
> will create a separate adaptation patch to work with Zhang's new
> thermal enhancements. Actually the above patches are being used
> internally.
>
well, as the patches has not been in Linus' tree, and they do not
compile, IMO, it would be better to fix it in the patch rather than
create an incremental one.
I can rewrite the generic cpufreq cooling patch if you do not have time
to.
thanks,
rui
> Thanks,
> Amit Daniel
>
> >
> > thanks,
> > rui
> >
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/