From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bjorn Andersson Subject: Re: linux-next: build failure after merge of the net-next tree Date: Tue, 10 May 2016 11:39:34 -0700 Message-ID: <20160510183934.GJ1256@tuxbot> References: <20160510112905.5bffcad8@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-pa0-f53.google.com ([209.85.220.53]:34399 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750955AbcEJSji (ORCPT ); Tue, 10 May 2016 14:39:38 -0400 Received: by mail-pa0-f53.google.com with SMTP id r5so8584874pag.1 for ; Tue, 10 May 2016 11:39:38 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20160510112905.5bffcad8@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell , David Miller , Andy Gross Cc: netdev@vger.kernel.org, Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org On Mon 09 May 18:29 PDT 2016, Stephen Rothwell wrote: > Hi all, > > After merging the net-next tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > net/qrtr/smd.c:106:14: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] > .callback = qcom_smd_qrtr_callback, > ^ > net/qrtr/smd.c:106:14: note: (near initialization for 'qcom_smd_qrtr_driver.callback') > > Caused by commit > > bdabad3e363d ("net: Add Qualcomm IPC router") > > interacting with commit > > b853cb9628bf ("soc: qcom: smd: Make callback pass channel reference") > > from the arm-soc tree. > > I added the following merge fix patch (and it turned out I needed the > new stubs). > Sorry for not spotting this issue earlier, I missed Andy's second pull request towards arm-soc and thought the SMD changes missed this cycle. Your patch looks good, but I'm not sure how we should approach the merge window; Andy can't pick the patch because he doesn't have the qrtr code and David doesn't have the SMD patches coming through Andy. FWIW, Reviewed-by: Bjorn Andersson 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)? Suggestions are welcome. Regards, Bjorn