Hi all, On Tue, 10 Mar 2015 17:44:54 +1100 Stephen Rothwell wrote: > > 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). This is what I applied: From: Stephen Rothwell Date: Wed, 11 Mar 2015 11:51:30 +1100 Subject: [PATCH] crypto: fix for sendmsg/recvmsg API change Signed-off-by: Stephen Rothwell --- crypto/algif_aead.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c index 527d27b023ab..001d8b5ad056 100644 --- a/crypto/algif_aead.c +++ b/crypto/algif_aead.c @@ -163,7 +163,7 @@ static void aead_data_wakeup(struct sock *sk) rcu_read_unlock(); } -static int aead_sendmsg(struct kiocb *unused, struct socket *sock, +static int aead_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) { struct sock *sk = sock->sk; @@ -348,7 +348,7 @@ unlock: return err ?: size; } -static int aead_recvmsg(struct kiocb *unused, struct socket *sock, +static int aead_recvmsg(struct socket *sock, struct msghdr *msg, size_t ignored, int flags) { struct sock *sk = sock->sk; -- 2.1.4 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au