From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752397AbbCJHCn (ORCPT ); Tue, 10 Mar 2015 03:02:43 -0400 Received: from mail.eperm.de ([89.247.134.16]:46457 "EHLO mail.eperm.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751024AbbCJHCj convert rfc822-to-8bit (ORCPT ); Tue, 10 Mar 2015 03:02:39 -0400 From: Stephan Mueller To: Stephen Rothwell Cc: Herbert Xu , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" , Linux Crypto Mailing List , netdev@vger.kernel.org Subject: Re: linux-next: build warnings after merge of the crypto tree Date: Tue, 10 Mar 2015 08:02:35 +0100 Message-ID: <1658340.bSp4ddJdxm@tauon> User-Agent: KMail/4.14.4 (Linux/3.18.7-200.fc21.x86_64; KDE/4.14.4; x86_64; ; ) In-Reply-To: <20150310174454.7a92a3bd@canb.auug.org.au> References: <20150310164417.540c18a4@canb.auug.org.au> <20150310060328.GA14997@gondor.apana.org.au> <20150310174454.7a92a3bd@canb.auug.org.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT Content-Type: text/plain; charset="iso-8859-1" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am Dienstag, 10. März 2015, 17:44:54 schrieb Stephen Rothwell: Hi Stephen, >Hi Herbert, > >On Tue, 10 Mar 2015 17:03:28 +1100 Herbert Xu wrote: >> On Tue, Mar 10, 2015 at 04:44:17PM +1100, Stephen Rothwell wrote: >> > After merging the crypto tree, today's (and the past few days) >> > linux-next build (powerpc allyesconfig) produced these warnings: >> > >> > crypto/algif_aead.c:561:2: warning: initialization from >> > incompatible pointer type> > >> > .sendmsg = aead_sendmsg, >> > ^ >> > >> > crypto/algif_aead.c:561:2: warning: (near initialization for >> > 'algif_aead_ops.sendmsg') crypto/algif_aead.c:563:2: warning: >> > initialization from incompatible pointer type> > >> > .recvmsg = aead_recvmsg, >> > ^ >> > >> > crypto/algif_aead.c:563:2: warning: (near initialization for >> > 'algif_aead_ops.recvmsg') >> > >> > Introduced by commit 400c40cf78da ("crypto: algif - add AEAD >> > support").> >> This is a bit of a bummer. What happened is that net-next has >> killed the kiocb argument to sendmsg/recvmsg. However, this >> change is obviously not part of the crypto tree and algif_aead >> only exists in the crypto tree. >> >> So Stephen could you fix this by hand until one of them is merged >> upstream (just kill the first argument in aead_sendmsg/aead_recvmsg)? > >No worries, I will put a merge fix patch in from tomorrow (and send you >a copy just in case). Thank you. Let me know if I should help. Ciao Stephan