diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-06-16 13:20:39 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-06-16 13:22:33 +0200 |
| commit | 98ca74f4d5b44e58d926a38ae160f1ff9573687e (patch) | |
| tree | 986868f47c88fe737e58c07db9a4c2ed9180a333 /net/rds/ib_cm.c | |
| parent | netfilter: nft_nat: don't dump port information if unset (diff) | |
| parent | ipvs: stop tot_stats estimator only under CONFIG_SYSCTL (diff) | |
| download | linux-98ca74f4d5b44e58d926a38ae160f1ff9573687e.tar.xz linux-98ca74f4d5b44e58d926a38ae160f1ff9573687e.zip | |
Merge branch 'ipvs'
Simon Horman says:
====================
Fix for panic due use of tot_stats estimator outside of CONFIG_SYSCTL
It has been present since v3.6.39.
====================
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/rds/ib_cm.c')
0 files changed, 0 insertions, 0 deletions