Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Just minor overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index d8ae0f1b4148..2852d0e76ea3 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -726,7 +726,7 @@ void __put_task_struct(struct task_struct *tsk)
         WARN_ON(tsk == current);
 
         cgroup_free(tsk);
-        task_numa_free(tsk);
+        task_numa_free(tsk, true);
         security_task_free(tsk);
         exit_creds(tsk);
         delayacct_tsk_free(tsk);