Index: SOURCES/module-init-tools-3.11.1.tar.bz2
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: SOURCES/blacklist-mdv
===================================================================
--- SOURCES/blacklist-mdv	(revision 642211)
+++ SOURCES/blacklist-mdv	(working copy)
@@ -19,27 +19,3 @@
 blacklist pcspkr
 blacklist snd-pcsp
 
-# disable autoloading of proprietary display drivers by default
-# They interfere with the free drivers.
-# The proprietary drivers are loaded later (if enabled) by:
-# (1) /etc/modprobe.preload.d/alternative-display-driver, or
-# (2) X.org server when initializing devices
-# The drivers will therefore work even while they are blacklisted.
-blacklist nvidia-current
-blacklist nvidia173
-blacklist nvidia96xx
-blacklist nvidia
-blacklist fglrx
-
-# disable automatic loading of KMS drivers by udev for now
-# They interfere with vesa/nv drivers and a more complex solution will be
-# needed before they can be safely enabled.
-# Despite the below entries, KMS drivers are still loaded by
-# (1) initrd when enabled (i915 by default)
-# (2) X.org server when it starts (nouveau)
-# (3) a manual /etc/modprobe.preload entry (radeon)
-# The drivers will therefore work even while they are blacklisted.
-blacklist i915
-blacklist nouveau
-blacklist radeon
-
Index: SOURCES/module-init-tools-3.6-blacklist-internal-aliases-only.patch
===================================================================
--- SOURCES/module-init-tools-3.6-blacklist-internal-aliases-only.patch	(revision 642211)
+++ SOURCES/module-init-tools-3.6-blacklist-internal-aliases-only.patch	(working copy)
@@ -1,25 +0,0 @@
-Index: module-init-tools-3.6/modprobe.c
-===================================================================
---- module-init-tools-3.6/modprobe.c
-+++ module-init-tools-3.6/modprobe.c	2010-05-05 22:51:39.849962293 +0300
-@@ -1337,8 +1337,8 @@
- 		read_kcmdline(0, &modoptions);
- 
- 		/* No luck?  Try symbol names, if starts with symbol:. */
--		if (!aliases
--		    && strncmp(modulearg, "symbol:", strlen("symbol:")) == 0) {
-+		if (!aliases) {
-+		if (strncmp(modulearg, "symbol:", strlen("symbol:")) == 0) {
- 			if (use_binary_indexes)
- 				read_config_file_bin(symfilename, modulearg, 0,
- 					remove, &modoptions, &commands,
-@@ -1370,6 +1370,9 @@
- 		}
- 
- 		aliases = apply_blacklist(aliases, blacklist);
-+		} else
-+			aliases = apply_blacklist(aliases, NULL); /* Reverses the list. */
-+
- 		if (aliases) {
- 			errfn_t err = error;
- 
Index: SPECS/module-init-tools.spec
===================================================================
--- SPECS/module-init-tools.spec	(revision 642211)
+++ SPECS/module-init-tools.spec	(working copy)
@@ -2,7 +2,7 @@
 %define name module-init-tools
 %define version 3.6
 %define priority 20
-%define mdkrelease %mkrel 14
+%define mdkrelease %mkrel 14.test.1
 %define url http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/
 %define _bindir /bin
 %define _sbindir /sbin
@@ -46,11 +46,6 @@
 Patch4: module-init-tools-3.2.2-generate-modprobe.conf-no-defaults.patch
 Patch5: module-init-tools-3.0-failed.unknown.symbol.patch
 Patch6: module-init-tools-3.5-preferred.patch
-# (Anssi) blacklist should only affect internal aliases as per documentation:
-# update: upstream thinks it is the documentation that is wrong;
-# this patch can be removed once "[RFC] How to handle loading KMS drivers early"
-# in cooker@ is implemented.
-Patch7: module-init-tools-3.6-blacklist-internal-aliases-only.patch
 License: GPL
 Group: System/Kernel and hardware
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -100,7 +95,6 @@
 %patch4 -p1 -b .generate-modprobe.conf-no-defaults
 %patch5 -p1 -b .failed-symb
 %patch6 -p1 -b .preferred
-%patch7 -p1 -b .blacklist-internal-aliases
 
 %build
 %serverbuild