Re: QRTR merge conflict resolution

2016-05-17 Thread Bjorn Andersson
On Tue 17 May 17:43 PDT 2016, Stephen Rothwell wrote: > Hi David, > > On Tue, 17 May 2016 14:11:54 -0400 (EDT) David Miller > wrote: > > > > From: Bjorn Andersson > > Date: Fri, 13 May 2016 15:19:09 -0700 > > > > > I have prepared the merge of net-next and the conflicting tag from the > > > Q

Re: QRTR merge conflict resolution

2016-05-17 Thread Stephen Rothwell
Hi David, On Tue, 17 May 2016 14:11:54 -0400 (EDT) David Miller wrote: > > From: Bjorn Andersson > Date: Fri, 13 May 2016 15:19:09 -0700 > > > I have prepared the merge of net-next and the conflicting tag from the > > Qualcomm SOC, please include this in your pull towards Linus to avoid > > th

Re: QRTR merge conflict resolution

2016-05-17 Thread David Miller
From: Bjorn Andersson Date: Fri, 13 May 2016 15:19:09 -0700 > I have prepared the merge of net-next and the conflicting tag from the > Qualcomm SOC, please include this in your pull towards Linus to avoid > the merge conflict. Pulled, thanks.

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