diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-06-02 07:58:11 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-06-02 07:58:11 +0200 |
| commit | aa6ada71ee1fc8c9a06cff7195704f5bc06b65c8 (patch) | |
| tree | 699edc93f7996ef5ede88bf43998af3f582ba592 /watchdog-Disable-watchdog-on-virtual-machines.patch | |
| parent | 651697182b0b06fe2c9261ee1902068a95931020 (diff) | |
| parent | 84558c957b3e0cdd17000affcbdbe22301443bfa (diff) | |
| download | kernel-aa6ada71ee1fc8c9a06cff7195704f5bc06b65c8.tar.gz kernel-aa6ada71ee1fc8c9a06cff7195704f5bc06b65c8.tar.xz kernel-aa6ada71ee1fc8c9a06cff7195704f5bc06b65c8.zip | |
merge stabilization branchkernel-4.6.1-300.vanilla.knurd.1.fc24kernel-4.6.1-300.vanilla.knurd.1.fc23kernel-4.6.1-300.vanilla.knurd.1.fc22
Diffstat (limited to 'watchdog-Disable-watchdog-on-virtual-machines.patch')
| -rw-r--r-- | watchdog-Disable-watchdog-on-virtual-machines.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/watchdog-Disable-watchdog-on-virtual-machines.patch b/watchdog-Disable-watchdog-on-virtual-machines.patch index 11bce5bb7..0a988c189 100644 --- a/watchdog-Disable-watchdog-on-virtual-machines.patch +++ b/watchdog-Disable-watchdog-on-virtual-machines.patch @@ -25,9 +25,9 @@ index 18f34cf..6aadffe 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -20,6 +20,7 @@ - #include <linux/smpboot.h> #include <linux/sched/rt.h> #include <linux/tick.h> + #include <linux/workqueue.h> +#include <linux/dmi.h> #include <asm/irq_regs.h> |