Stephen, On Mon, Aug 22, 2016 at 11:43:46AM +1000, Stephen Rothwell wrote: > Hi Eduardo, > > The thermal-soc tree now shares quite a few patches (but not commits) > with the thermal tree. These are causing a few unnecessary conflicts, > so please clean it up.
I had to be out for several weeks and my tree was broken during this time causing the above problem. Sorry for this. I have removed the problematic patches out of linux-next way. Let me know if you still have troubles. BR, Eduardo Valentin > > -- > Cheers, > Stephen Rothwell
