lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 13 May 2016 17:47:17 -0500 From: Andy Gross <andy.gross@...aro.org> To: Bjorn Andersson <bjorn.andersson@...aro.org> Cc: David Miller <davem@...emloft.net>, Arnd Bergmann <arnd@...db.de>, linux-arm-kernel@...ts.infradead.org, Stephen Rothwell <sfr@...b.auug.org.au>, netdev@...r.kernel.org, Linux Kernel list <linux-kernel@...r.kernel.org>, linux-next@...r.kernel.org, Olof Johansson <olof@...om.net> Subject: Re: QRTR merge conflict resolution (was: Re: linux-next: build failure after merge of the net-next tree) On 13 May 2016 at 17:19, Bjorn Andersson <bjorn.andersson@...aro.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@...aro.org>
Powered by blists - more mailing lists