All of lore.kernel.org
 help / color / mirror / Atom feed
From: Zhang Rui <rui.zhang@intel.com>
To: Amit Kachhap <amit.kachhap@linaro.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Guenter Roeck <linux@roeck-us.net>,
	Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	LKML <linux-kernel@vger.kernel.org>,
	linux-next@vger.kernel.org
Subject: Re: thermal patches in linux-next
Date: Fri, 10 Aug 2012 13:51:37 +0800	[thread overview]
Message-ID: <1344577897.1682.724.camel@rui.sh.intel.com> (raw)
In-Reply-To: <CAK44p21GpTdi1Gx=dcphXG_ZFicooLUe3Bc+dEhip+1TR0eBWg@mail.gmail.com>

On 五, 2012-08-10 at 10:37 +0530, Amit Kachhap wrote:
> On 10 August 2012 08:14, Zhang Rui <rui.zhang@intel.com> 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@intel.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.
> 
> 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
> >



  reply	other threads:[~2012-08-10  5:50 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-07  2:53 thermal patches in linux-next Zhang Rui
2012-08-07  4:40 ` Kuninori Morimoto
2012-08-07 12:13 ` Amit Kachhap
     [not found] ` <1344494746.1682.669.camel@rui.sh.intel.com>
2012-08-09 23:08   ` Stephen Rothwell
2012-08-10  1:41     ` Zhang Rui
2012-08-10  2:23       ` Stephen Rothwell
2012-08-10  2:44         ` Zhang Rui
2012-08-10  5:07           ` Amit Kachhap
2012-08-10  5:51             ` Zhang Rui [this message]
2012-08-14  6:15               ` Amit Kachhap
     [not found]                 ` <CAK44p23u18MsDxPL_NkZqJLpstJJAGTfxDP4SCSuFuYzQq8-oA@mail.gmail.com>
2012-08-17  0:42                   ` Zhang Rui

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1344577897.1682.724.camel@rui.sh.intel.com \
    --to=rui.zhang@intel.com \
    --cc=akpm@linux-foundation.org \
    --cc=amit.kachhap@linaro.org \
    --cc=kuninori.morimoto.gx@renesas.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.