Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 3 insertions, 1 deletions

diff --git a/include/net/garp.h b/include/net/garp.h
index 825f172caba9..834d8add9e5f 100644
--- a/include/net/garp.h
+++ b/include/net/garp.h
@@ -104,10 +104,12 @@ struct garp_applicant {
         struct sk_buff_head     queue;
         struct sk_buff          *pdu;
         struct rb_root          gid;
+        struct rcu_head         rcu;
 };
 
 struct garp_port {
-        struct garp_applicant   *applicants[GARP_APPLICATION_MAX + 1];
+        struct garp_applicant __rcu     *applicants[GARP_APPLICATION_MAX + 1];
+        struct rcu_head                 rcu;
 };
 
 extern int      garp_register_application(struct garp_application *app);