diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-10 11:22:34 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-10 11:22:34 +0300 |
| commit | c4aa8b2a8b63a269d63acafc0358a7b9f5d9e563 (patch) | |
| tree | d04a7861e542665bb7c03aac729a72c957be8abc /drivers/hv/hyperv_vmbus.h | |
| parent | 48d365de7746a000afd7f9f7cc1821cbb6fe9b45 (diff) | |
| parent | 40e020c129cfc991e8ab4736d2665351ffd1468d (diff) | |
| download | linux-c4aa8b2a8b63a269d63acafc0358a7b9f5d9e563.tar.xz | |
Merge 4.20-rc6 into char-misc-next
This should resolve the hv driver merge conflict.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hv/hyperv_vmbus.h')
| -rw-r--r-- | drivers/hv/hyperv_vmbus.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h index f17c06a5e74b..313a07f5efa1 100644 --- a/drivers/hv/hyperv_vmbus.h +++ b/drivers/hv/hyperv_vmbus.h @@ -333,7 +333,14 @@ struct vmbus_connection { struct list_head chn_list; struct mutex channel_mutex; + /* + * An offer message is handled first on the work_queue, and then + * is further handled on handle_primary_chan_wq or + * handle_sub_chan_wq. + */ struct workqueue_struct *work_queue; + struct workqueue_struct *handle_primary_chan_wq; + struct workqueue_struct *handle_sub_chan_wq; }; |