diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-12-31 17:51:02 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-12-31 17:51:02 +0100 |
| commit | b28bc9b38c52f63f43e3fd875af982f2240a2859 (patch) | |
| tree | 76cdb7b52b58f5685993cc15ed81d1c903023358 /net/ipv6/protocol.c | |
| parent | dm cache: increment bi_remaining when bi_end_io is restored (diff) | |
| parent | Linux 3.13-rc6 (diff) | |
| download | linux-b28bc9b38c52f63f43e3fd875af982f2240a2859.tar.xz linux-b28bc9b38c52f63f43e3fd875af982f2240a2859.zip | |
Merge tag 'v3.13-rc6' into for-3.14/core
Needed to bring blk-mq uptodate, since changes have been going in
since for-3.14/core was established.
Fixup merge issues related to the immutable biovec changes.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Conflicts:
block/blk-flush.c
fs/btrfs/check-integrity.c
fs/btrfs/extent_io.c
fs/btrfs/scrub.c
fs/logfs/dev_bdev.c
Diffstat (limited to 'net/ipv6/protocol.c')
| -rw-r--r-- | net/ipv6/protocol.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/ipv6/protocol.c b/net/ipv6/protocol.c index 22d1bd4670da..e048cf1bb6a2 100644 --- a/net/ipv6/protocol.c +++ b/net/ipv6/protocol.c @@ -36,10 +36,6 @@ int inet6_add_protocol(const struct inet6_protocol *prot, unsigned char protocol } EXPORT_SYMBOL(inet6_add_protocol); -/* - * Remove a protocol from the hash tables. - */ - int inet6_del_protocol(const struct inet6_protocol *prot, unsigned char protocol) { int ret; |