linux-next: manual merge of the thermal-soc tree with the arm tree

linux-next: manual merge of the thermal-soc tree with the arm tree

[Stephen Rothwell]

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

Re: linux-next: manual merge of the thermal-soc tree with the arm tree

[Viresh Kumar]

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

Re: linux-next: manual merge of the thermal-soc tree with the arm tree

[Russell King - ARM Linux]

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.

Re: linux-next: manual merge of the thermal-soc tree with the arm tree

[Stephen Rothwell]

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

Re: linux-next: manual merge of the thermal-soc tree with the arm tree

[Eduardo Valentin]

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