Re: linux-next: build failure after merge of the net-next tree

Path	csiph.com!weretis.net!feeder4.news.weretis.net!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Arnd Bergmann <arnd@arndb.de>
Newsgroups	linux.kernel
Subject	Re: linux-next: build failure after merge of the net-next tree
Date	Fri, 13 May 2016 23:10:03 +0200
Message-ID	<rysvp-2VC-9@gated-at.bofh.it> (permalink)
References	<rx4EO-Fw-7@gated-at.bofh.it> <rxkJA-8hw-5@gated-at.bofh.it>
User-Agent	KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; )
MIME-Version	1.0
Content-Transfer-Encoding	7Bit
Content-Type	text/plain; charset="us-ascii"
X-Provags-ID	V03:K0:6s5Zd4j1KHn4U3ByJuMpEnf0/FmeQtUQSXWAiX7FXNDNK/GSz7q l0ZyV5lL0iKWiU9zcCnAvvuGjX7oRaQ4iux7GjkivvtmLVXZTrJsl3MKDlhjEuIg6kuuV/u sgNy+uMV93W1X/wIqr8TcDKFhRHYrSoENb7njTJj+YKDwOy8S2UFIfuMLUQ1RKeHjPG3GVY Ia7GEgVyuRGOkweC91MKw==
X-Ui-Out-Filterresults	notjunk:1;V01:K0:+aD4KBr+e68=:/AJWZHxWfmk1qcmv+fjJXa 3e//q1gLv+auLKv8qVNq1VyHwklZoplKB2YEwysGN+yan3K22QJq7E4lTWayB9qA2mahZmqsT KqQpCh9tG7wpEFeM7e3eb9gYwPfCCj4ncLPxF9P+wZAirooLlHA2MtqDzF8fiIZgwSltc276t fVDbWUJBcKHB+GqBmlDHF5Y2+NZmGs1FZFbUMGyW9Or83Ke56xacd904BlwD96XEk1QqbZ+Ux m3CkDUYet8A2owXhcEoUXscdMLznyKGsJblvOCv9YQZVammrhItlP0BfYvrlss2jGdVnLLryj 1YVnyRaObk4+1ZVKtXfBtMoGjbzpCNVxG1/2WOfNsNlQPyiyiPQizEZ1LO+YJ/vlzdALlgG/c iFrnGcWXspgqzNCtcKTTtFW+syiaqr4pCn8yTr/pG5brzHXCQaH76AdRBsvLQZ7sOwOLrj63G d8scbSUw80l0nRPD1x5wilnIBL94e8p6GHyNAidhMNa28f4aQNwn1veSfKI//h9pG0OdsMye0 QhGC7OlagycIvCmWF2Hm89Ne6eW6qfW035PkfL+0ZQj7jHxWiyTJHb1Xf9hs4ZSf32cGbtlIp uoPwk21ZH5RtPAmmKDHVzKARCyBCXYtY8XprdO2iBGzf5xwOLE2Pe6dkvxzHe9vjZ5DCeN8od i4xlH1xoQP4fEuhfDzgSmknisdwarq9eWNx0tgzruwDDh4PlghLDm+RI7V/GYDMkfpbrXz257 6FPzxZkvvAyDS6TiNc6AUjsIM7VOR8T8wX9yhA==
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	51
Organization	linux.* mail to news gateway
X-Original-Cc	Bjorn Andersson <bjorn.andersson@linaro.org>, Stephen Rothwell <sfr@canb.auug.org.au>, David Miller <davem@davemloft.net>, Andy Gross <andy.gross@linaro.org>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, Olof Johansson <olof@lixom.net>
X-Original-Date	Fri, 13 May 2016 23:01:11 +0200
X-Original-Message-ID	<2606282.lG9qK7uBW0@wuerfel>
X-Original-References	<20160510112905.5bffcad8@canb.auug.org.au> <20160510183934.GJ1256@tuxbot>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1400980

Show key headers only | View raw

On Tuesday 10 May 2016 11:39:34 Bjorn Andersson wrote:
> 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 <bjorn.andersson@linaro.org>
> 
> 
> 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.

Alternatively, in case Linus merges net-next before we get that fix
in, I could send Stephen's fix to Linus along with the pull requests.

	Arnd

Back to linux.kernel | Previous | Next — 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