Merge 3.11-rc3 into char-misc-next.

This resolves a merge issue with:
	drivers/misc/mei/init.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c
index a73ea217f24d..339eae85859a 100644
--- a/drivers/vhost/test.c
+++ b/drivers/vhost/test.c
@@ -13,7 +13,6 @@
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/workqueue.h>
-#include <linux/rcupdate.h>
 #include <linux/file.h>
 #include <linux/slab.h>
 
@@ -200,9 +199,8 @@ static long vhost_test_run(struct vhost_test *n, int test)
                 priv = test ? n : NULL;
 
                 /* start polling new socket */
-                oldpriv = rcu_dereference_protected(vq->private_data,
-                                                    lockdep_is_held(&vq->mutex));
-                rcu_assign_pointer(vq->private_data, priv);
+                oldpriv = vq->private_data;
+                vq->private_data = priv;
 
                 r = vhost_init_used(&n->vqs[index]);