summaryrefslogtreecommitdiffstats
path: root/watchdog-Disable-watchdog-on-virtual-machines.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-05-21 08:35:34 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-05-21 08:35:34 -0400
commit58bbe0b0646c0e2ede47af739b864531c4b2366e (patch)
tree8d72ede82121339eacf1eb8a9f11ae86de7b3af4 /watchdog-Disable-watchdog-on-virtual-machines.patch
parent3f7ea9f387523b9b65a362aa9ce48aa6c26f70e5 (diff)
downloadkernel-58bbe0b0646c0e2ede47af739b864531c4b2366e.tar.gz
kernel-58bbe0b0646c0e2ede47af739b864531c4b2366e.tar.xz
kernel-58bbe0b0646c0e2ede47af739b864531c4b2366e.zip
Linux v4.1-rc4-11-g1113cdfe7d2c
- Reenable debugging options. - Add patch to fix discard on md RAID0 (rhbz 1223332)
Diffstat (limited to 'watchdog-Disable-watchdog-on-virtual-machines.patch')
-rw-r--r--watchdog-Disable-watchdog-on-virtual-machines.patch2
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 70b3c3211..45a241a0e 100644
--- a/watchdog-Disable-watchdog-on-virtual-machines.patch
+++ b/watchdog-Disable-watchdog-on-virtual-machines.patch
@@ -20,7 +20,7 @@ Signed-off-by: Dave Jones <davej@redhat.com>
1 file changed, 29 insertions(+)
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
-index 506edcc500c4..8b622b336b64 100644
+index 581a68a04c64..18b609d3360a 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -19,6 +19,7 @@