Merge 039aeb9deb ("Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm") into android-mainline

Baby steps on the way to 5.8-rc1.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I5962e12546d3d215c73c3d74b00ad6263d96f64e
This commit is contained in:
Greg Kroah-Hartman
2020-06-20 09:49:29 +02:00
890 changed files with 30156 additions and 29144 deletions

View File

@@ -434,7 +434,7 @@ struct virtio_device_id {
* For Hyper-V devices we use the device guid as the id.
*/
struct hv_vmbus_device_id {
uuid_le guid;
guid_t guid;
kernel_ulong_t driver_data; /* Data private to the driver */
};