Re: QRTR merge conflict resolution (was: Re: linux-next: build failure after merge of the net-next tree)

2016-05-14 Thread Arnd Bergmann
On Friday 13 May 2016 17:47:17 Andy Gross wrote: > On 13 May 2016 at 17:19, Bjorn Andersson wrote: > > On Fri 13 May 14:01 PDT 2016, Arnd Bergmann wrote: > > > >> On Tuesday 10 May 2016 11:39:34 Bjorn Andersson wrote: > > [..] > >> > I assume we could have the QRTR go through Andy and arm-soc, wit

Re: QRTR merge conflict resolution (was: Re: linux-next: build failure after merge of the net-next tree)

2016-05-13 Thread Andy Gross
On 13 May 2016 at 17:19, Bjorn Andersson wrote: > On Fri 13 May 14:01 PDT 2016, Arnd Bergmann wrote: > >> On Tuesday 10 May 2016 11:39:34 Bjorn Andersson wrote: > [..] >> > I assume we could have the QRTR go through Andy and arm-soc, with >> > David's approval and this fix squashed in. But we're r

QRTR merge conflict resolution (was: Re: linux-next: build failure after merge of the net-next tree)

2016-05-13 Thread Bjorn Andersson
On Fri 13 May 14:01 PDT 2016, Arnd Bergmann wrote: > On Tuesday 10 May 2016 11:39:34 Bjorn Andersson wrote: [..] > > I assume we could have the QRTR go through Andy and arm-soc, with > > David's approval and this fix squashed in. But we're running rather late > > in this cycle, perhaps we should j