Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1401020

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

Show all headers | View raw

On 13 May 2016 at 17:19, Bjorn Andersson <bjorn.andersson@linaro.org> 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 running rather late
>> > in this cycle, perhaps we should just back the QRTR patches out and I
>> > can respin and resend them after the merge window (for v4.8 instead)?
>>
>> I'd suggest you do a merge of next-next with the qcom/soc-2 branch that
>> we have in arm-soc and resolve the conflict in the merge, then send
>> a pull request with the merge to davem.
>>
>
> Hi David,
>
> In case you missed this thread, linux-next highlighted an upcoming merge
> conflict between the net-next and one of the branches included in the
> arm-soc trees.
>
> 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.
>
> Regards,
> Bjorn
>
> The following changes since commit ed7cbbce544856b20e5811de373cf92e92499771:
>
>   udp: Resolve NULL pointer dereference over flow-based vxlan device (2016-05-13 01:56:14 -0400)


OK. The contents look good to me.

Acked-by: Andy Gross <andy.gross@linaro.org>

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

Re: linux-next: build failure after merge of the net-next tree Arnd Bergmann <arnd@arndb.de> - 2016-05-13 23:10 +0200
  QRTR merge conflict resolution (was: Re: linux-next: build failure  after merge of the net-next tree) Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-05-14 00:20 +0200
    Re: QRTR merge conflict resolution (was: Re: linux-next: build  failure after merge of the net-next tree) Andy Gross <andy.gross@linaro.org> - 2016-05-14 00:50 +0200
      Re: QRTR merge conflict resolution (was: Re: linux-next: build failure after merge of the net-next tree) Arnd Bergmann <arnd@arndb.de> - 2016-05-14 21:50 +0200
    Re: QRTR merge conflict resolution David Miller <davem@davemloft.net> - 2016-05-17 20:20 +0200
      Re: QRTR merge conflict resolution Stephen Rothwell <sfr@canb.auug.org.au> - 2016-05-18 02:50 +0200
        Re: QRTR merge conflict resolution Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-05-18 06:10 +0200

csiph-web