Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts were easy to resolve using immediate context mostly, except the cls_u32.c one where I simply too the entire HEAD chunk. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -195,6 +195,8 @@ void fib6_info_destroy_rcu(struct rcu_head *head)
|
||||
*ppcpu_rt = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
free_percpu(f6i->rt6i_pcpu);
|
||||
}
|
||||
|
||||
lwtstate_put(f6i->fib6_nh.nh_lwtstate);
|
||||
|
Reference in New Issue
Block a user