From 146f07a112dc617f495186ce2d80d700645e87d4 Mon Sep 17 00:00:00 2001
From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Mon, 14 Mar 2016 13:59:25 -0700
Subject: [PATCH] uek-rpm: configs: do not enable CONFIG_SCSI_MQ_DEFAULT and
 CONFIG_DM_MQ_DEFAULT by default

Orabug: 22742028

CONFIG_SCSI_MQ_DEFAULT and CONFIG_DM_MQ_DEFAULT are not stable.

Signed-off-by: Chuck Anderson <chuck.anderson@oracle.com>
Reviewed-by: Guru Anbalagane <guru.anbalagane@oracle.com>
---
 uek-rpm/ol6/config-x86_64       | 4 ++--
 uek-rpm/ol6/config-x86_64-debug | 4 ++--
 uek-rpm/ol7/config-x86_64       | 4 ++--
 uek-rpm/ol7/config-x86_64-debug | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/uek-rpm/ol6/config-x86_64 b/uek-rpm/ol6/config-x86_64
index 98097e969348..38f90c18c66f 100644
--- a/uek-rpm/ol6/config-x86_64
+++ b/uek-rpm/ol6/config-x86_64
@@ -1865,7 +1865,7 @@ CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
 CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_MQ_DEFAULT=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -2111,7 +2111,7 @@ CONFIG_BCACHE=y
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=m
-CONFIG_DM_MQ_DEFAULT=y
+# CONFIG_DM_MQ_DEFAULT is not set
 CONFIG_DM_DEBUG=y
 CONFIG_DM_BUFIO=m
 CONFIG_DM_BIO_PRISON=m
diff --git a/uek-rpm/ol6/config-x86_64-debug b/uek-rpm/ol6/config-x86_64-debug
index cd702a69fe66..1ea971dabf36 100644
--- a/uek-rpm/ol6/config-x86_64-debug
+++ b/uek-rpm/ol6/config-x86_64-debug
@@ -1856,7 +1856,7 @@ CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
 CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_MQ_DEFAULT=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -2102,7 +2102,7 @@ CONFIG_BCACHE=y
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=m
-CONFIG_DM_MQ_DEFAULT=y
+# CONFIG_DM_MQ_DEFAULT is not set
 CONFIG_DM_DEBUG=y
 CONFIG_DM_BUFIO=m
 CONFIG_DM_BIO_PRISON=m
diff --git a/uek-rpm/ol7/config-x86_64 b/uek-rpm/ol7/config-x86_64
index 6439653fc3d8..dceb6c768a63 100644
--- a/uek-rpm/ol7/config-x86_64
+++ b/uek-rpm/ol7/config-x86_64
@@ -1874,7 +1874,7 @@ CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
 CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_MQ_DEFAULT=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -2122,7 +2122,7 @@ CONFIG_BCACHE=y
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=m
-CONFIG_DM_MQ_DEFAULT=y
+# CONFIG_DM_MQ_DEFAULT is not set
 CONFIG_DM_DEBUG=y
 CONFIG_DM_BUFIO=m
 CONFIG_DM_BIO_PRISON=m
diff --git a/uek-rpm/ol7/config-x86_64-debug b/uek-rpm/ol7/config-x86_64-debug
index d9d4039b0866..3029dc0cb4ca 100644
--- a/uek-rpm/ol7/config-x86_64-debug
+++ b/uek-rpm/ol7/config-x86_64-debug
@@ -1865,7 +1865,7 @@ CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
 CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_MQ_DEFAULT=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -2113,7 +2113,7 @@ CONFIG_BCACHE=y
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=m
-CONFIG_DM_MQ_DEFAULT=y
+# CONFIG_DM_MQ_DEFAULT is not set
 CONFIG_DM_DEBUG=y
 CONFIG_DM_BUFIO=m
 CONFIG_DM_BIO_PRISON=m
-- 
2.50.1