From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Mon, 22 Oct 2012 10:30:41 +0000 (+0200)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bcc58c4d9141160d6448e4589acbd46e5c647518;p=~shefty%2Frdma-dev.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next

Pull updates from Jesper Dangaard Brouer for IPVS mostly targeted
to improve IPv6 support (7 commits):

 ipvs: Trivial changes, use compressed IPv6 address in output
 ipvs: IPv6 extend ICMPv6 handling for future types
 ipvs: Use config macro IS_ENABLED()
 ipvs: Fix faulty IPv6 extension header handling in IPVS
 ipvs: Complete IPv6 fragment handling for IPVS
 ipvs: API change to avoid rescan of IPv6 exthdr
 ipvs: SIP fragment handling
---

bcc58c4d9141160d6448e4589acbd46e5c647518