Re: linux-next: build warnings after merge of the crypto tree

Stephen Rothwell
2015-03-10T06:44:54Z

[-- Attachment #1: Type: text/plain, Size: 1397 bytes --]

Hi Herbert,

On Tue, 10 Mar 2015 17:03:28 +1100 Herbert Xu <herbert@gondor.apana.org.au> 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).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]