diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-07 18:44:48 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-07 18:44:48 +0200 |
| commit | 52bf8031c06464268b1a7810946a54de5b088e81 (patch) | |
| tree | 14570a22ea27ec42cb02be3c489e5afbab4982e6 /include | |
| parent | Merge tag 'devicetree-fixes-for-5.15-3' of git://git.kernel.org/pub/scm/linux... (diff) | |
| parent | x86/hyperv: Avoid erroneously sending IPI to 'self' (diff) | |
| download | linux-52bf8031c06464268b1a7810946a54de5b088e81.tar.xz linux-52bf8031c06464268b1a7810946a54de5b088e81.zip | |
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.h | 2 |
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. |