From: David S. Miller Date: Tue, 15 Mar 2011 20:03:27 +0000 (-0700) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=31111c26d976ca0f298312f08e44cdb078005b03;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'master' of git://git./linux/kernel/git/kaber/nf-next-2.6 Conflicts: Documentation/feature-removal-schedule.txt --- 31111c26d976ca0f298312f08e44cdb078005b03 diff --cc Documentation/feature-removal-schedule.txt index d6f5255ca547,a7ee7cf5009e..a9c4245e2fd8 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@@ -622,18 -619,10 +622,27 @@@ Files: net/netfilter/xt_connlimit. ---------------------------- +What: noswapaccount kernel command line parameter +When: 2.6.40 +Why: The original implementation of memsw feature enabled by + CONFIG_CGROUP_MEM_RES_CTLR_SWAP could be disabled by the noswapaccount + kernel parameter (introduced in 2.6.29-rc1). Later on, this decision + turned out to be not ideal because we cannot have the feature compiled + in and disabled by default and let only interested to enable it + (e.g. general distribution kernels might need it). Therefore we have + added swapaccount[=0|1] parameter (introduced in 2.6.37) which provides + the both possibilities. If we remove noswapaccount we will have + less command line parameters with the same functionality and we + can also cleanup the parameter handling a bit (). +Who: Michal Hocko + +---------------------------- ++ + What: ipt_addrtype match include file + When: 2012 + Why: superseded by xt_addrtype + Who: Florian Westphal + Files: include/linux/netfilter_ipv4/ipt_addrtype.h ++>>>>>>> 2f5dc63123905a89d4260ab8ee08d19ec104db04 + + ---------------------------- diff --cc net/netfilter/ipvs/ip_vs_ctl.c index a60b20fa142e,fa6d44c62de3..b799cea31f95 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@@ -767,12 -800,12 +798,12 @@@ __ip_vs_update_dest(struct ip_vs_servic dest->u_threshold = udest->u_threshold; dest->l_threshold = udest->l_threshold; - spin_lock(&dest->dst_lock); + spin_lock_bh(&dest->dst_lock); ip_vs_dst_reset(dest); - spin_unlock(&dest->dst_lock); + spin_unlock_bh(&dest->dst_lock); if (add) - ip_vs_new_estimator(svc->net, &dest->stats); + ip_vs_start_estimator(svc->net, &dest->stats); write_lock_bh(&__ip_vs_svc_lock);