diff --git a/kernel.spec b/kernel.spec index 0ccf9e938..65110ce5f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -627,8 +627,6 @@ Patch09: upstream-reverts.patch # Standalone patches -Patch100: taint-vbox.patch - Patch110: vmbugon-warnon.patch #atch200: debug-bad-pte-dmi.patch @@ -1289,8 +1287,6 @@ ApplyOptionalPatch compile-fixes.patch # revert patches from upstream that conflict or that we get via other means ApplyOptionalPatch upstream-reverts.patch -R -ApplyPatch taint-vbox.patch - ApplyPatch vmbugon-warnon.patch #plyPatch debug-bad-pte-dmi.patch diff --git a/taint-vbox.patch b/taint-vbox.patch deleted file mode 100644 index b0ab4f6e6..000000000 --- a/taint-vbox.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/kernel/module.c b/kernel/module.c -index 921bed4..382414e 100644 ---- a/kernel/module.c -+++ b/kernel/module.c -@@ -2873,6 +2873,10 @@ static int check_module_license_and_versions(struct module *mod) - if (strcmp(mod->name, "ndiswrapper") == 0) - add_taint(TAINT_PROPRIETARY_MODULE, LOCKDEP_NOW_UNRELIABLE); - -+ /* vbox is garbage. */ -+ if (strcmp(mod->name, "vboxdrv") == 0) -+ add_taint(TAINT_CRAP, LOCKDEP_NOW_UNRELIABLE); -+ - /* driverloader was caught wrongly pretending to be under GPL */ - if (strcmp(mod->name, "driverloader") == 0) - add_taint_module(mod, TAINT_PROPRIETARY_MODULE,