From b3a35e1ec0af5aab433344380fd8e60403d202a3 Mon Sep 17 00:00:00 2001
From: Laura Abbott <labbott@fedoraproject.org>
Date: Wed, 16 Dec 2015 13:14:09 -0800
Subject: [PATCH] Enable a set of RDMA drivers (rhbz 1291902)

---
 config-generic | 16 ++++++++++------
 kernel.spec    |  3 +++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/config-generic b/config-generic
index e1e17b0b1..4067365ab 100644
--- a/config-generic
+++ b/config-generic
@@ -195,8 +195,8 @@ CONFIG_INFINIBAND_NES=m
 # CONFIG_INFINIBAND_NES_DEBUG is not set
 CONFIG_INFINIBAND_QIB=m
 CONFIG_INFINIBAND_QIB_DCA=y
-# CONFIG_INFINIBAND_OCRDMA is not set
-# CONFIG_INFINIBAND_USNIC is not set
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_USNIC=m
 
 #
 # Executable file formats
@@ -1433,7 +1433,8 @@ CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T3=m
 CONFIG_CHELSIO_T4=m
 CONFIG_CHELSIO_T4VF=m
-# CONFIG_CHELSIO_T4_DCB is not set
+CONFIG_CHELSIO_T4_DCB=y
+CONFIG_CHELSIO_T4_FCOE=y
 
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
@@ -1684,9 +1685,12 @@ CONFIG_JME=m
 
 #
 # CONFIG_IP1000 is not set
-# CONFIG_MLX4_EN is not set
-# CONFIG_MLX4_EN_VXLAN is not set
-# CONFIG_MLX5_CORE is not set
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_EN_VXLAN=y
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_CORE_EN=y
 # CONFIG_MLXSW_CORE is not set
 # CONFIG_SFC is not set
 
diff --git a/kernel.spec b/kernel.spec
index 745ba408a..2208429a8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2068,6 +2068,9 @@ fi
 #
 # 
 %changelog
+* Wed Dec 16 2015 Laura Abbott <labbott@redhat.com>
+- Enable a set of RDMA drivers (rhbz 1291902)
+
 * Wed Dec 16 2015 Laura Abbott <labbott@redhat.com> - 4.4.0-0.rc5.git1.1
 - Linux v4.4-rc5-18-gedb42dc