diff options
| author | David S. Miller <davem@davemloft.net> | 2013-10-01 18:39:35 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-01 18:39:35 +0200 |
| commit | e024bdc051ab99eafb5dd9bad87e79afc27f8a44 (patch) | |
| tree | 8c219a19c37c49e89b18e085ffb90b70cc63cb2c /include/asm-generic/vtime.h | |
| parent | qlcnic: Fix SR-IOV configuration (diff) | |
| parent | netfilter: synproxy: fix BUG_ON triggered by corrupt TCP packets (diff) | |
| download | linux-e024bdc051ab99eafb5dd9bad87e79afc27f8a44.tar.xz linux-e024bdc051ab99eafb5dd9bad87e79afc27f8a44.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/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 <davem@davemloft.net>
Diffstat (limited to 'include/asm-generic/vtime.h')
0 files changed, 0 insertions, 0 deletions