Merge tag 'v3.19-rc4' into next

Merge with mainline to bring in the latest thermal and other changes.

1 files changed, 2 insertions, 1 deletions

diff --git a/include/uapi/linux/hyperv.h b/include/uapi/linux/hyperv.h
index 78e4a86030dd..bb1cb73c927a 100644
--- a/include/uapi/linux/hyperv.h
+++ b/include/uapi/linux/hyperv.h
@@ -134,10 +134,11 @@ struct hv_start_fcopy {
 
 struct hv_do_fcopy {
         struct hv_fcopy_hdr hdr;
+        __u32   pad;
         __u64   offset;
         __u32   size;
         __u8    data[DATA_FRAGMENT];
-};
+} __attribute__((packed));
 
 /*
  * An implementation of HyperV key value pair (KVP) functionality for Linux.