* linux-next: please clean up the thermal-soc tree
@ 2016-08-22 1:43 Stephen Rothwell
2016-09-05 13:03 ` Eduardo Valentin
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2016-08-22 1:43 UTC (permalink / raw)
To: Eduardo Valentin; +Cc: linux-next, linux-kernel, Zhang Rui
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.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: please clean up the thermal-soc tree
2016-08-22 1:43 linux-next: please clean up the thermal-soc tree Stephen Rothwell
@ 2016-09-05 13:03 ` Eduardo Valentin
2016-09-05 23:34 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Eduardo Valentin @ 2016-09-05 13:03 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Zhang Rui
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: please clean up the thermal-soc tree
2016-09-05 13:03 ` Eduardo Valentin
@ 2016-09-05 23:34 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2016-09-05 23:34 UTC (permalink / raw)
To: Eduardo Valentin; +Cc: linux-next, linux-kernel, Zhang Rui
Hi Eduardo,
On Mon, 5 Sep 2016 06:03:35 -0700 Eduardo Valentin <edubezval@gmail.com> wrote:
>
> 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.
Thanks for that.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-09-05 23:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-22 1:43 linux-next: please clean up the thermal-soc tree Stephen Rothwell
2016-09-05 13:03 ` Eduardo Valentin
2016-09-05 23:34 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).