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, 9 insertions, 1 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 8dc1811487f5..9f51932bd543 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1092,7 +1092,15 @@ struct task_struct {
         u64                             last_sum_exec_runtime;
         struct callback_head            numa_work;
 
-        struct numa_group               *numa_group;
+        /*
+         * This pointer is only modified for current in syscall and
+         * pagefault context (and for tasks being destroyed), so it can be read
+         * from any of the following contexts:
+         *  - RCU read-side critical section
+         *  - current->numa_group from everywhere
+         *  - task's runqueue locked, task not running
+         */
+        struct numa_group __rcu         *numa_group;
 
         /*
          * numa_faults is an array split into four regions: