[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1344566688.1682.711.camel@rui.sh.intel.com>
Date: Fri, 10 Aug 2012 10:44:48 +0800
From: Zhang Rui <rui.zhang@...el.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Amit Kachhap <amit.kachhap@...aro.org>,
Guenter Roeck <linux@...ck-us.net>,
Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>,
Andrew Morton <akpm@...ux-foundation.org>,
LKML <linux-kernel@...r.kernel.org>, linux-next@...r.kernel.org
Subject: Re: thermal patches in linux-next
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@...el.com> 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.
thanks,
rui
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists