Merge tag 'v3.16-rc6' into next

Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.

1 files changed, 7 insertions, 0 deletions

diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index 2d7b4f139c32..08cfaff8a072 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -696,6 +696,8 @@ struct vmbus_channel {
          * preserve the earlier behavior.
          */
         u32 target_vp;
+        /* The corresponding CPUID in the guest */
+        u32 target_cpu;
         /*
          * Support for sub-channels. For high performance devices,
          * it will be useful to have multiple sub-channels to support
@@ -732,6 +734,11 @@ struct vmbus_channel {
          * Support per-channel state for use by vmbus drivers.
          */
         void *per_channel_state;
+        /*
+         * To support per-cpu lookup mapping of relid to channel,
+         * link up channels based on their CPU affinity.
+         */
+        struct list_head percpu_list;
 };
 
 static inline void set_channel_read_state(struct vmbus_channel *c, bool state)