Security update, RHSA-2014:1392-2

[packages/centos6/kernel.git] / config-generic

diff --git a/config-generic b/config-generic
index f32c80dd92be144abd5871d181b89551c4404c23..af34f3ce6a632d87f6badab13479c9a399c4c4be 100644 (file)
--- a/config-generic
+++ b/config-generic
@@ -51,6 +51,7 @@ CONFIG_PID_NS=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
 CONFIG_NET_NS=y
+CONFIG_NET_IPGRE_DEMUX=m
 
 CONFIG_POSIX_MQUEUE=y
 # CONFIG_PREEMPT_NONE is not set
@@ -149,6 +150,7 @@ CONFIG_INFINIBAND_AMSO1100=m
 CONFIG_INFINIBAND_CXGB3=m
 # CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
 CONFIG_INFINIBAND_NES=m
 # CONFIG_INFINIBAND_NES_DEBUG is not set
 
@@ -532,6 +534,8 @@ CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_SAS=m
 CONFIG_SCSI_MVSAS=m
 # CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+
 CONFIG_SCSI_MPT2SAS=m
 CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 CONFIG_SCSI_MPT2SAS_LOGGING=y
@@ -1343,6 +1347,7 @@ CONFIG_TEHUTI=m
 CONFIG_ENIC=m
 CONFIG_MLX4_EN=m
 # CONFIG_MLX4_DEBUG is not set
+CONFIG_MLX5_CORE=m
 CONFIG_QLGE=m
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
@@ -3510,7 +3515,7 @@ CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SEQIV=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TGR192=m