summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2017-10-02 23:30:02 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2017-10-02 23:30:02 -0400
commit4019e5290f5678c3954800fd14760ba03bc8a031 (patch)
tree738f22b41a5c04b49ff1f31ca0a5aa90d472a134
parentb5e0d29d9fa737581c1387b6a8a6024986049ed0 (diff)
download4.12-rt-patches-4019e5290f5678c3954800fd14760ba03bc8a031.tar.gz
mce: disable swait patch now it has been re-writtenrt-v4.11-1249-g3dee9fb2a4ce
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--patches/series3
1 files changed, 2 insertions, 1 deletions
diff --git a/patches/series b/patches/series
index 34a3cff0e325c0..a554749dea9499 100644
--- a/patches/series
+++ b/patches/series
@@ -503,7 +503,8 @@ fs-jbd2-pull-your-plug-when-waiting-for-space.patch
# X86
x86-mce-timer-hrtimer.patch
-x86-mce-use-swait-queue-for-mce-wakeups.patch
+# Appears below should not be needed after merge v4.11-1249-g3dee9fb2a4ce
+# x86-mce-use-swait-queue-for-mce-wakeups.patch
x86-stackprot-no-random-on-rt.patch
x86-use-gen-rwsem-spinlocks-rt.patch
x86-UV-raw_spinlock-conversion.patch