Merge tag 'v4.20-rc7' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 7 insertions, 0 deletions

diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index b3e24368930a..14131b6fae68 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -905,6 +905,13 @@ struct vmbus_channel {
 
         bool probe_done;
 
+        /*
+         * We must offload the handling of the primary/sub channels
+         * from the single-threaded vmbus_connection.work_queue to
+         * two different workqueue, otherwise we can block
+         * vmbus_connection.work_queue and hang: see vmbus_process_offer().
+         */
+        struct work_struct add_channel_work;
 };
 
 static inline bool is_hvsock_channel(const struct vmbus_channel *c)