diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2018-06-28 14:07:57 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2018-06-28 14:07:57 +0200 |
| commit | 4ac44d603f290242cbba2e0d0383460412d55c04 (patch) | |
| tree | a573d3a85920efb639707e6e528e0cac59666199 /crypto/algif_hash.c | |
| parent | aeb235fbdded8149156360a2b2f9ca2c6d99448e (diff) | |
| parent | c5c0586a6771a33a5da7985495c1beab72d292b1 (diff) | |
| download | linux-crypto-4ac44d603f290242cbba2e0d0383460412d55c04.tar.gz linux-crypto-4ac44d603f290242cbba2e0d0383460412d55c04.zip | |
Merge tag 'v4.18-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Linux 4.18-rc2
Diffstat (limited to '')
| -rw-r--r-- | crypto/algif_hash.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c index 6c9b1927..bfcf595f 100644 --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -288,7 +288,6 @@ static struct proto_ops algif_hash_ops = { .mmap = sock_no_mmap, .bind = sock_no_bind, .setsockopt = sock_no_setsockopt, - .poll = sock_no_poll, .release = af_alg_release, .sendmsg = hash_sendmsg, @@ -396,7 +395,6 @@ static struct proto_ops algif_hash_ops_nokey = { .mmap = sock_no_mmap, .bind = sock_no_bind, .setsockopt = sock_no_setsockopt, - .poll = sock_no_poll, .release = af_alg_release, .sendmsg = hash_sendmsg_nokey, |