From: Pablo Neira Ayuso Date: Wed, 26 Aug 2015 18:33:58 +0000 (+0200) Subject: Merge tag 'ipvs2-for-v4.3' of https://git.kernel.org/pub/scm/linux/kernel/git/horms... X-Git-Tag: firefly_0821_release~176^2~1159^2~41^2~2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1b383bf912b25029fb180cf2cf8f33f90d6cf97f;p=firefly-linux-kernel-4.4.55.git Merge tag 'ipvs2-for-v4.3' of https://git./linux/kernel/git/horms/ipvs-next Simon Horman says: ==================== Second Round of IPVS Updates for v4.3 I realise these are a little late in the cycle, so if you would prefer me to repost them for v4.4 then just let me know. The updates include: * A new scheduler from Raducu Deaconu * Enhanced configurability of the sync daemon from Julian Anastasov ==================== Signed-off-by: Pablo Neira Ayuso --- 1b383bf912b25029fb180cf2cf8f33f90d6cf97f