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

Russell, On Mon, Aug 17, 2015 at 12:55 AM, Russell King - ARM Linux 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: >> >

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

Hi Russell, On Mon, 17 Aug 2015 08:55:49 +0100 Russell King - ARM Linux 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. S

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

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") > > f

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

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 c

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

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 proble