diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-07-04 10:27:12 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-07-04 10:27:12 +1000 |
| commit | f29135ee4e0d4e01911ed569f731bfdb841cea6d (patch) | |
| tree | e72d49a2f677dd069c3a673522cf785548148f71 /net/netrom/af_netrom.c | |
| parent | eab976693153b9854bfa83d131374748f6ca4280 (diff) | |
| parent | 021c91791a5e7e85c567452f1be3e4c2c6cb6063 (diff) | |
Merge v4.18-rc3 into drm-next
Two requests have come in for a backmerge,
and I've got some pull reqs on rc2, so this
just makes sense.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'net/netrom/af_netrom.c')
| -rw-r--r-- | net/netrom/af_netrom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 93fbcafbf388..03f37c4e64fe 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -1355,7 +1355,7 @@ static const struct proto_ops nr_proto_ops = { .socketpair = sock_no_socketpair, .accept = nr_accept, .getname = nr_getname, - .poll_mask = datagram_poll_mask, + .poll = datagram_poll, .ioctl = nr_ioctl, .listen = nr_listen, .shutdown = sock_no_shutdown, |