[kernel] r22118 - dists/wheezy-security/linux/debian/patches

[Ben Hutchings]

Author: benh
Date: Sun Dec  7 03:42:35 2014
New Revision: 22118

Log:
Resolve conflicts between rt patcheset and fix for CVE-2014-9090

Modified:
   dists/wheezy-security/linux/debian/patches/series-rt

Modified: dists/wheezy-security/linux/debian/patches/series-rt
==============================================================================
--- dists/wheezy-security/linux/debian/patches/series-rt	Sun Dec  7 03:42:04 2014	(r22117)
+++ dists/wheezy-security/linux/debian/patches/series-rt	Sun Dec  7 03:42:35 2014	(r22118)
@@ -220,7 +220,6 @@
 features/all/rt/0219-x86-Convert-mce-timer-to-hrtimer.patch
 features/all/rt/0220-x86-stackprotector-Avoid-random-pool-on-rt.patch
 features/all/rt/0221-x86-Use-generic-rwsem_spinlocks-on-rt.patch
-features/all/rt/0222-x86-Disable-IST-stacks-for-debug-int-3-stack-fault-f.patch
 features/all/rt/0223-workqueue-use-get-cpu-light.patch.patch
 features/all/rt/0224-epoll.patch.patch
 features/all/rt/0225-mm-vmalloc.patch.patch
@@ -331,7 +330,6 @@
 features/all/rt/0330-smp-add-func-to-IPI-cpus-based-on-parameter-func.patch
 features/all/rt/0331-fs-only-send-IPI-to-invalidate-LRU-BH-when-needed.patch
 features/all/rt/0332-rcutree-rcu_bh_qs-disable-irq-while-calling-rcu_pree.patch
-features/all/rt/0333-Revert-x86-Disable-IST-stacks-for-debug-int-3-stack-.patch
 features/all/rt/0334-rt-Make-cpu_chill-use-hrtimer-instead-of-msleep.patch
 features/all/rt/0335-kernel-hrtimer-be-non-freezeable-in-cpu_chill.patch
 features/all/rt/0336-arm-unwind-use-a-raw_spin_lock.patch