From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753967AbcENTsH (ORCPT ); Sat, 14 May 2016 15:48:07 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:51355 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753790AbcENTsE (ORCPT ); Sat, 14 May 2016 15:48:04 -0400 From: Arnd Bergmann To: Andy Gross Cc: Bjorn Andersson , David Miller , linux-arm-kernel@lists.infradead.org, Stephen Rothwell , netdev@vger.kernel.org, Linux Kernel list , linux-next@vger.kernel.org, Olof Johansson Subject: Re: QRTR merge conflict resolution (was: Re: linux-next: build failure after merge of the net-next tree) Date: Sat, 14 May 2016 21:47:11 +0200 Message-ID: <3145757.u11669EZop@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: References: <20160510112905.5bffcad8@canb.auug.org.au> <20160513221909.GC1256@tuxbot> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:HHJc4yVSpaIM5glxcOn984O9C59kh8TADZ8LYnG7enod3Tz0XlH sUnUrXbWPIej5XExN9vHH7JrtjNusk70hseQI4Ee3Nek/oOJArI6jYJuwmEwa+l6ifvwtv7 gy2vVKECJ+Yy+569/jTes1Tv9NWbpe8lOhbtISp4zpQs+RkaLMso67P+U6JS3SBmtF7ANNe dWvWmiNphZkpi+w5Ssh/g== X-UI-Out-Filterresults: notjunk:1;V01:K0:7zcVxFkMjrE=:VXxAdv0zJ3k5urwgupSruH +yQmki273jOFdWkcqqsKFa2d43LvUDsDzpa+MWrVsASPUEfVDjK4niTI/GQ3WnjOA+VVrJNFs YlbRbgnsSnhYCDAP2kRNTi06t4RrCZoQVGDb4x8AP9rNPTlroT8E6cAEURsBri/LroOk3OMpE oXn1K7wDcsF3pKwUx1POl74HE9HU2UvkYRdBh+o0ayW/5xDbVKXH8uok1QEI/7+7E2kMzzQqU tuVBPXlXZ7A1pSuBQOP5P2kdsM9ukfEJ2Jc6YLoi0xbr6PVQ5jGmXUHzN+kTFWvFlG4cFJ1+V chbPBuW67S0XjAOpVad3DqxMGCmMxtwHXYhTwBmAEAbYMg7HfRIebu9gw1qU0j/eBJR8ToBlR 6sCDACffBRKFwDHhQ7lCXInejbsedBm2Bp10YpJX383i8HWqEyp+Xy1hLihZ7tFlfmk419urj xOiTMvcq9UEtfrRw+UUPFYgWav7PITiB53/WDf/eHpqmzkz6gZj7ByT5z7PIBKbOv/OUqokGF HV/TLh6c+paEFTVjI7rbljHOVNUh6A+65hI7XcYEqPCptzWk6koHlcCVtqgUk9XXla25SySjJ om4eGulK9/UDiq9GLcv0emWZShWD62qRgB70hkfK7MmYGl6lVxOa0XOBlX/6cFoP1FjNaszWV K4WxULIq4XeVRC4zizzicsa3RSPik7zzxUGV/deYJD05xcLANUXDeSOf6cNkdwbHnnbGBLSww E7BIzIeamGjKaimyqadxqBkE2j18vcOulKTQ0g== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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, 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 Acked-by: Arnd Bergmann