summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-10-07 19:44:48 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2021-10-07 19:44:48 +0300
commit52bf8031c06464268b1a7810946a54de5b088e81 (patch)
tree14570a22ea27ec42cb02be3c489e5afbab4982e6 /include
parent5af4055fa8133662831ae2fb6e188e8f6c172688 (diff)
parentf5c20e4a5f18677e22d8dd2846066251b006a62d (diff)
downloadlinux-52bf8031c06464268b1a7810946a54de5b088e81.tar.xz
Merge tag 'hyperv-fixes-signed-20211007' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux
Pull hyperv fixes from Wei Liu: - Replace uuid.h with types.h in a header (Andy Shevchenko) - Avoid sleeping in atomic context in PCI driver (Long Li) - Avoid sending IPI to self when it shouldn't (Vitaly Kuznetsov) * tag 'hyperv-fixes-signed-20211007' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux: x86/hyperv: Avoid erroneously sending IPI to 'self' hyper-v: Replace uuid.h with types.h PCI: hv: Fix sleep while in non-sleep context when removing child devices from the bus
Diffstat (limited to 'include')
-rw-r--r--include/uapi/linux/hyperv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/hyperv.h b/include/uapi/linux/hyperv.h
index 6135d92e0d47..daf82a230c0e 100644
--- a/include/uapi/linux/hyperv.h
+++ b/include/uapi/linux/hyperv.h
@@ -26,7 +26,7 @@
#ifndef _UAPI_HYPERV_H
#define _UAPI_HYPERV_H
-#include <linux/uuid.h>
+#include <linux/types.h>
/*
* Framework version for util services.