* linux-next: manual merge of the thermal-soc tree with the arm tree
@ 2015-08-17 2:17 Stephen Rothwell
2015-08-17 2:24 ` Viresh Kumar
2015-08-17 7:55 ` Russell King - ARM Linux
0 siblings, 2 replies; 5+ messages in thread
From: Stephen Rothwell @ 2015-08-17 2:17 UTC (permalink / raw)
To: Eduardo Valentin, Russell King; +Cc: linux-next, linux-kernel, Viresh Kumar
Hi Eduardo,
Today's linux-next merge of the thermal-soc tree got a conflict in:
drivers/thermal/cpu_cooling.c
between commit:
df6f527755a5 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
from the arm tree and commits:
02373d7c69b4 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
a24af233a1fd ("thermal/cpu_cooling: convert 'switch' block to 'if' block in notifier")
from the thermal-soc tree.
I fixed it up (the first two look like two versions of the same patch,
so I used the version from the thermal-soc tree) and can carry the fix
as necessary (no action is required).
Russell: that commit in your tree has no Signed-off-by :-(
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the thermal-soc tree with the arm tree
2015-08-17 2:17 linux-next: manual merge of the thermal-soc tree with the arm tree Stephen Rothwell
@ 2015-08-17 2:24 ` Viresh Kumar
2015-08-17 7:55 ` Russell King - ARM Linux
1 sibling, 0 replies; 5+ messages in thread
From: Viresh Kumar @ 2015-08-17 2:24 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Eduardo Valentin, Russell King, linux-next, linux-kernel
On 17-08-15, 12:17, Stephen Rothwell wrote:
> Hi Eduardo,
>
> Today's linux-next merge of the thermal-soc tree got a conflict in:
>
> drivers/thermal/cpu_cooling.c
>
> between commit:
>
> df6f527755a5 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
>
> from the arm tree and commits:
>
> 02373d7c69b4 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
> a24af233a1fd ("thermal/cpu_cooling: convert 'switch' block to 'if' block in notifier")
>
> from the thermal-soc tree.
>
> I fixed it up (the first two look like two versions of the same patch,
> so I used the version from the thermal-soc tree) and can carry the fix
> as necessary (no action is required).
Right the version from the thermal tree is the updated version and
should be picked.
> Russell: that commit in your tree has no Signed-off-by :-(
No. It does have a SOB, but that followed a bit of rant/history on why
Russell carried this patch :)
Russell should be dropping that patch soon, AFAIU.
--
viresh
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the thermal-soc tree with the arm tree
2015-08-17 2:17 linux-next: manual merge of the thermal-soc tree with the arm tree Stephen Rothwell
2015-08-17 2:24 ` Viresh Kumar
@ 2015-08-17 7:55 ` Russell King - ARM Linux
2015-08-17 8:03 ` Stephen Rothwell
2015-08-18 9:33 ` Eduardo Valentin
1 sibling, 2 replies; 5+ messages in thread
From: Russell King - ARM Linux @ 2015-08-17 7:55 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Eduardo Valentin, linux-next, linux-kernel, Viresh Kumar
On Mon, Aug 17, 2015 at 12:17:54PM +1000, Stephen Rothwell wrote:
> Hi Eduardo,
>
> Today's linux-next merge of the thermal-soc tree got a conflict in:
>
> drivers/thermal/cpu_cooling.c
>
> between commit:
>
> df6f527755a5 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
>
> from the arm tree and commits:
>
> 02373d7c69b4 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
> a24af233a1fd ("thermal/cpu_cooling: convert 'switch' block to 'if' block in notifier")
>
> from the thermal-soc tree.
>
> I fixed it up (the first two look like two versions of the same patch,
> so I used the version from the thermal-soc tree) and can carry the fix
> as necessary (no action is required).
>
> Russell: that commit in your tree has no Signed-off-by :-(
Yes it does. It's above the explanation of why it's there. However,
now that Eduardo has taken patches to fix the long standing bug, I can
drop this commit.
--
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the thermal-soc tree with the arm tree
2015-08-17 7:55 ` Russell King - ARM Linux
@ 2015-08-17 8:03 ` Stephen Rothwell
2015-08-18 9:33 ` Eduardo Valentin
1 sibling, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2015-08-17 8:03 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: Eduardo Valentin, linux-next, linux-kernel, Viresh Kumar
Hi Russell,
On Mon, 17 Aug 2015 08:55:49 +0100 Russell King - ARM Linux <linux@arm.linux.org.uk> wrote:
>
> Yes it does. It's above the explanation of why it's there. However,
> now that Eduardo has taken patches to fix the long standing bug, I can
> drop this commit.
Ah, yes, I only expect to see them at the end. Sorry about that. And
thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the thermal-soc tree with the arm tree
2015-08-17 7:55 ` Russell King - ARM Linux
2015-08-17 8:03 ` Stephen Rothwell
@ 2015-08-18 9:33 ` Eduardo Valentin
1 sibling, 0 replies; 5+ messages in thread
From: Eduardo Valentin @ 2015-08-18 9:33 UTC (permalink / raw)
To: Russell King - ARM Linux; +Cc: Stephen Rothwell, linux-next, LKML, Viresh Kumar
Russell,
On Mon, Aug 17, 2015 at 12:55 AM, Russell King - ARM Linux <linux@arm.linux.org.uk> wrote:
> On Mon, Aug 17, 2015 at 12:17:54PM +1000, Stephen Rothwell wrote:
>> Hi Eduardo,
>>
>> Today's linux-next merge of the thermal-soc tree got a conflict in:
>>
>> drivers/thermal/cpu_cooling.c
>>
>> between commit:
>>
>> df6f527755a5 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
>>
>> from the arm tree and commits:
>>
>> 02373d7c69b4 ("thermal: cpu_cooling: fix lockdep problems in cpu_cooling")
>> a24af233a1fd ("thermal/cpu_cooling: convert 'switch' block to 'if' block in notifier")
>>
>> from the thermal-soc tree.
>>
>> I fixed it up (the first two look like two versions of the same patch,
>> so I used the version from the thermal-soc tree) and can carry the fix
>> as necessary (no action is required).
>>
>> Russell: that commit in your tree has no Signed-off-by :-(
>
> Yes it does. It's above the explanation of why it's there. However,
> now that Eduardo has taken patches to fix the long standing bug, I can
> drop this commit.
>
Thanks once again for the effort to push the fix. Once again, sorry for the inconvenience.
> --
> FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
> according to speedtest.net.
--
Eduardo Bezerra Valentin
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-08-18 2:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-17 2:17 linux-next: manual merge of the thermal-soc tree with the arm tree Stephen Rothwell
2015-08-17 2:24 ` Viresh Kumar
2015-08-17 7:55 ` Russell King - ARM Linux
2015-08-17 8:03 ` Stephen Rothwell
2015-08-18 9:33 ` Eduardo Valentin
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.