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

2019-05-14 Thread Stephen Rothwell
Hi Eduardo, On Tue, 14 May 2019 07:15:33 -0700 Eduardo Valentin wrote: > > On Tue, May 14, 2019 at 02:40:06PM +1000, Stephen Rothwell wrote: > > Hi Eduardo, > > > > On Mon, 13 May 2019 20:44:11 -0700 Eduardo Valentin > > wrote: > > > > > > Thanks for spotting this. I am re-doing the branch b

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

2019-05-14 Thread Eduardo Valentin
Hey Stephen, On Tue, May 14, 2019 at 02:40:06PM +1000, Stephen Rothwell wrote: > Hi Eduardo, > > On Mon, 13 May 2019 20:44:11 -0700 Eduardo Valentin > 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.

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

2019-05-13 Thread Stephen Rothwell
Hi Eduardo, On Mon, 13 May 2019 20:44:11 -0700 Eduardo Valentin 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. -- C

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

2019-05-13 Thread Eduardo Valentin
Stephen, On Mon, May 13, 2019 at 10:49:28AM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the thermal-soc tree got a conflict in: > > MAINTAINERS > > between commit: > > f23afd75fc99 ("RDMA/efa: Add driver to Kconfig/Makefile") > > from Linus' tree and commit: >