From: Pablo Neira Ayuso Date: Thu, 30 Oct 2014 15:51:25 +0000 (+0100) Subject: Merge branch 'ipvs-next' X-Git-Tag: v3.19-rc1~118^2~122^2~11 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=c3ac759ea6e9836d3040abed92f797383da4024f;p=linux-block.git Merge branch 'ipvs-next' Simon Horman says: ==================== The single patch in this series fixes some minor fallout from adding support IPv6 real servers in IPv4 virtual-services and vice versa. It should not have any run-time affect other than perhaps saving a few cycles. ==================== Signed-off-by: Pablo Neira Ayuso --- c3ac759ea6e9836d3040abed92f797383da4024f