From: David S. Miller Date: Tue, 1 Oct 2013 16:39:35 +0000 (-0400) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf X-Git-Tag: v3.12-rc4~30^2~4 X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=e024bdc051ab99eafb5dd9bad87e79afc27f8a44;p=cascardo%2Flinux.git Merge branch 'master' of git://git./linux/kernel/git/pablo/nf Pablo Neira Ayuso says: ==================== The following patchset contains Netfilter/IPVS fixes for your net tree, they are: * Fix BUG_ON splat due to malformed TCP packets seen by synproxy, from Patrick McHardy. * Fix possible weight overflow in lblc and lblcr schedulers due to 32-bits arithmetics, from Simon Kirby. * Fix possible memory access race in the lblc and lblcr schedulers, introduced when it was converted to use RCU, two patches from Julian Anastasov. * Fix hard dependency on CPU 0 when reading per-cpu stats in the rate estimator, from Julian Anastasov. * Fix race that may lead to object use after release, when invoking ipvsadm -C && ipvsadm -R, introduced when adding RCU, from Julian Anastasov. ==================== Signed-off-by: David S. Miller --- e024bdc051ab99eafb5dd9bad87e79afc27f8a44