diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-11 08:57:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-11 08:57:22 +0200 |
| commit | ae73e7784871ebe2c43da619b4a1e2c9ff81508d (patch) | |
| tree | 724238ba2877c672e4a61d46ec11f48d2d560936 /include/uapi/linux/hyperv.h | |
| parent | staging: vt6656: Use const for read only data (diff) | |
| parent | Linux 5.7-rc5 (diff) | |
Merge 5.7-rc5 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/uapi/linux/hyperv.h')
| -rw-r--r-- | include/uapi/linux/hyperv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/hyperv.h b/include/uapi/linux/hyperv.h index 991b2b7ada7a..8f24404ad04f 100644 --- a/include/uapi/linux/hyperv.h +++ b/include/uapi/linux/hyperv.h @@ -119,8 +119,8 @@ enum hv_fcopy_op { struct hv_fcopy_hdr { __u32 operation; - uuid_le service_id0; /* currently unused */ - uuid_le service_id1; /* currently unused */ + __u8 service_id0[16]; /* currently unused */ + __u8 service_id1[16]; /* currently unused */ } __attribute__((packed)); #define OVER_WRITE 0x1 |