Merge tag 'v3.15' into next

Linux 3.15
This commit is contained in:
Paul Moore
2014-06-17 17:30:23 -04:00
10923 changed files with 682417 additions and 321840 deletions

View File

@@ -46,10 +46,11 @@ static inline void selinux_xfrm_notify_policyload(void)
{
struct net *net;
atomic_inc(&flow_cache_genid);
rtnl_lock();
for_each_net(net)
for_each_net(net) {
atomic_inc(&net->xfrm.flow_cache_genid);
rt_genid_bump_all(net);
}
rtnl_unlock();
}
#else