From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754144AbcEJBwP (ORCPT ); Mon, 9 May 2016 21:52:15 -0400 Received: from mail-yw0-f180.google.com ([209.85.161.180]:34386 "EHLO mail-yw0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752576AbcEJBwN (ORCPT ); Mon, 9 May 2016 21:52:13 -0400 MIME-Version: 1.0 In-Reply-To: <20160510112905.5bffcad8@canb.auug.org.au> References: <20160510112905.5bffcad8@canb.auug.org.au> Date: Mon, 9 May 2016 20:52:12 -0500 Message-ID: Subject: Re: linux-next: build failure after merge of the net-next tree From: Andy Gross To: Stephen Rothwell Cc: David Miller , netdev@vger.kernel.org, Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, Linux Kernel list , Bjorn Andersson Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 9 May 2016 at 20:29, 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). Thanks for fixing this up. I'll work with Bjorn to get this resolved. I'll have something up for tomorrow's next pull. Regards, Andy Gross