Subject: Re: linux-next: manual merge of the thermal-soc tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 14 May 2019 14:40:06 +1000

Hi Eduardo,

On Mon, 13 May 2019 20:44:11 -0700 Eduardo Valentin <[email-masked]> wrote:
>
> Thanks for spotting this. I am re-doing the branch based off v5.1-rc7,
> where the last conflict went in with my current queue.

Its really not worth the rebase.  Just fix the build problem and send it
all to Linus.

-- 
Cheers,
Stephen Rothwell