diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch
index 1f9099647..fbdd66011 100755
--- a/scripts/generate-kernel-patch
+++ b/scripts/generate-kernel-patch
@@ -339,8 +339,13 @@ done
 # Directory drivers/
 
 (
-add_patch "scst/kernel/in-tree/Kconfig.drivers.Linux-${kver}.patch" \
-          "drivers/Kconfig"
+if [ -e "scst/kernel/in-tree/Kconfig.drivers.Linux-${kver}.patch" ]; then
+  add_patch "scst/kernel/in-tree/Kconfig.drivers.Linux-${kver}.patch" \
+            "drivers/Kconfig"
+else
+  add_patch "scst/kernel/in-tree/Kconfig.drivers.Linux.patch" \
+            "drivers/Kconfig"
+fi
 
 add_patch "scst/kernel/in-tree/Makefile.drivers.Linux-${kver}.patch"\
           "drivers/Makefile"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.37.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.37.patch
deleted file mode 100644
index 0cdb1a392..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.37.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index a2b902f..92e3d67 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.38.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.38.patch
deleted file mode 100644
index 0cdb1a392..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.38.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index a2b902f..92e3d67 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.39.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.39.patch
deleted file mode 100644
index 0cdb1a392..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.39.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index a2b902f..92e3d67 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.0.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.0.patch
deleted file mode 100644
index 0cdb1a392..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index a2b902f..92e3d67 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.1.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.1.patch
deleted file mode 100644
index 0cdb1a392..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index a2b902f..92e3d67 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.10.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.10.patch
deleted file mode 100644
index 0cdb1a392..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.10.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index a2b902f..92e3d67 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.11.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.11.patch
deleted file mode 100644
index 0cdb1a392..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.11.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index a2b902f..92e3d67 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.13.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.13.patch
deleted file mode 100644
index 0d5a19f0f..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index aa43b91..c96860e 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -24,6 +24,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.14.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.14.patch
deleted file mode 100644
index 0d5a19f0f..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index aa43b91..c96860e 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -24,6 +24,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.15.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.15.patch
deleted file mode 100644
index 0d5a19f0f..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.15.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index aa43b91..c96860e 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -24,6 +24,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.16.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.16.patch
deleted file mode 100644
index 0d5a19f0f..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.16.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index aa43b91..c96860e 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -24,6 +24,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.17.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.17.patch
deleted file mode 100644
index 0d5a19f0f..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.17.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index aa43b91..c96860e 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -24,6 +24,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.18.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.18.patch
deleted file mode 100644
index 0d5a19f0f..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.18.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index aa43b91..c96860e 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -24,6 +24,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.19.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.19.patch
deleted file mode 100644
index 39d30a55e..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.19.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index c70d6e4..0a4ed1b 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.2.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.2.patch
deleted file mode 100644
index 0cdb1a392..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index a2b902f..92e3d67 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.3.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.3.patch
deleted file mode 100644
index 0cdb1a392..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index a2b902f..92e3d67 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.4.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.4.patch
deleted file mode 100644
index 0cdb1a392..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index a2b902f..92e3d67 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.5.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.5.patch
deleted file mode 100644
index 0cdb1a392..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.5.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index a2b902f..92e3d67 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.6.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.6.patch
deleted file mode 100644
index 0cdb1a392..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index a2b902f..92e3d67 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.7.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.7.patch
deleted file mode 100644
index 0cdb1a392..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.7.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index a2b902f..92e3d67 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.8.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.8.patch
deleted file mode 100644
index 0cdb1a392..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index a2b902f..92e3d67 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.9.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-3.9.patch
deleted file mode 100644
index 0cdb1a392..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.9.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index a2b902f..92e3d67 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -22,6 +22,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.0.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.0.patch
deleted file mode 100644
index 39d30a55e..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index c70d6e4..0a4ed1b 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.1.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.1.patch
deleted file mode 100644
index 39d30a55e..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index c70d6e4..0a4ed1b 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.2.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.2.patch
deleted file mode 100644
index 39d30a55e..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index c70d6e4..0a4ed1b 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.3.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.3.patch
deleted file mode 100644
index 39d30a55e..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index c70d6e4..0a4ed1b 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.4.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.4.patch
deleted file mode 100644
index 39d30a55e..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index c70d6e4..0a4ed1b 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.5.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.5.patch
deleted file mode 100644
index 39d30a55e..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.5.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index c70d6e4..0a4ed1b 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.6.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-4.6.patch
deleted file mode 100644
index 39d30a55e..000000000
--- a/scst/kernel/in-tree/Kconfig.drivers.Linux-4.6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index c70d6e4..0a4ed1b 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -26,6 +26,8 @@ source "drivers/ide/Kconfig"
- 
- source "drivers/scsi/Kconfig"
- 
-+source "drivers/scst/Kconfig"
-+
- source "drivers/ata/Kconfig"
- 
- source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-3.12.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux.patch
similarity index 100%
rename from scst/kernel/in-tree/Kconfig.drivers.Linux-3.12.patch
rename to scst/kernel/in-tree/Kconfig.drivers.Linux.patch