[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20141119120320.GA10180@developer>
Date: Wed, 19 Nov 2014 08:03:22 -0400
From: Eduardo Valentin <edubezval@...il.com>
To: Lukasz Majewski <l.majewski@...sung.com>
Cc: Linux PM <linux-pm@...r.kernel.org>,
Caesar Wang <caesar.wang@...k-chips.com>,
Wei Ni <wni@...dia.com>,
Mikko Perttunen <mikko.perttunen@...si.fi>,
Alexandre Courbot <gnurou@...il.com>,
devicetree@...r.kernel.org, Grant Likely <grant.likely@...aro.org>,
Guenter Roeck <linux@...ck-us.net>,
Jean Delvare <jdelvare@...e.de>, linux-kernel@...r.kernel.org,
linux-tegra@...r.kernel.org, lm-sensors@...sensors.org,
Rob Herring <robh+dt@...nel.org>,
Stephen Warren <swarren@...dotorg.org>,
Thierry Reding <thierry.reding@...il.com>,
Zhang Rui <rui.zhang@...el.com>
Subject: Re: [PATCHv4 1/1] thermal: of: improve of-thermal sensor
registration API
Hey Lukasz,
On Wed, Nov 19, 2014 at 09:21:39AM +0100, Lukasz Majewski wrote:
> Hi Eduardo,
>
<big cut>
> > }
>
> On which branch should I apply this patch?
>
This is based in my -linus branch. That means I will send this for the
next major window, not rc. The branch -fixes of thermal-soc include
patches for rc windows.
> I've tried to apply this patch on top of newest linux-soc-thermal/next:
> git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git
> branch: next
> SHA1:4027494124fd88e5d51127eebba315de5d8d57c8
>
> Unfortunately, it conflicts with:
> "thermal: fix multiple disbalanced device node counters"
> c2aad93c Vladimir Zapolskiy
The -next branch is intended to contain patches for linux-next testing.
I include the content of -linus and -fixes together to be tested in
linux-next.
However, as this patch has not been merged yet into -linus, I haven't
rebuilt my -next branch.
>
>
> --
> Best regards,
>
> Lukasz Majewski
>
> Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
Download attachment "signature.asc" of type "application/pgp-signature" (474 bytes)
Powered by blists - more mailing lists