Hi all, After merging the net-next tree, today's linux-next build (x86_64 allmodconfig) failed like this: net/xdp/xsk.c: In function 'xsk_poll': net/xdp/xsk.c:207:22: error: implicit declaration of function 'datagram_poll'; did you mean 'datagram_poll_mask'? [-Werror=implicit-function-declaration] unsigned int mask = datagram_poll(file, sock, wait); ^~~~~~~~~~~~~ datagram_poll_mask Caused by commit c497176cb2e4 ("xsk: add Rx receive functions and poll support") interacting with commit db5051ead64a ("net: convert datagram_poll users tp ->poll_mask") from the vfs tree. [Christoph, I noticed that the comment above datagram_poll in net/core/datagram.c needs the function name updated] I have added the following merge fix patch for today: From: Stephen Rothwell Date: Tue, 29 May 2018 13:34:25 +1000 Subject: [PATCH] xsk: update for "net: convert datagram_poll users tp->poll_mask" Signed-off-by: Stephen Rothwell --- net/xdp/xsk.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index cce0e4f8a536..4ee140afbc61 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -201,10 +201,9 @@ static int xsk_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len) return xsk_generic_xmit(sk, m, total_len); } -static unsigned int xsk_poll(struct file *file, struct socket *sock, - struct poll_table_struct *wait) +static __poll_t xsk_poll_mask(struct socket *sock, __poll_t events) { - unsigned int mask = datagram_poll(file, sock, wait); + __poll_t mask = datagram_poll_mask(sock, events); struct sock *sk = sock->sk; struct xdp_sock *xs = xdp_sk(sk); @@ -580,7 +579,7 @@ static const struct proto_ops xsk_proto_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = sock_no_getname, - .poll = xsk_poll, + .poll_mask = xsk_poll_mask, .ioctl = sock_no_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown, -- 2.17.0 -- Cheers, Stephen Rothwell