From: Santosh Shilimkar Date: Wed, 26 Aug 2015 16:28:01 +0000 (-0700) Subject: uek-rpm: configs: sync up config with v4.1.6 stable tag X-Git-Tag: v4.1.12-92~294^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b29a4f0cdc5940215c372f391570dcc281d68159;p=users%2Fjedix%2Flinux-maple.git uek-rpm: configs: sync up config with v4.1.6 stable tag Signed-off-by: Santosh Shilimkar --- diff --git a/uek-rpm/ol6/config-x86_64 b/uek-rpm/ol6/config-x86_64 index 4ac669dddb1a..4e460c270c56 100644 --- a/uek-rpm/ol6/config-x86_64 +++ b/uek-rpm/ol6/config-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.1.5 Kernel Configuration +# Linux/x86 4.1.6 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1258,7 +1258,10 @@ CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set CONFIG_SCTP_COOKIE_HMAC_MD5=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y -# CONFIG_RDS is not set +CONFIG_RDS=m +CONFIG_RDS_RDMA=m +CONFIG_RDS_TCP=m +# CONFIG_RDS_DEBUG is not set # CONFIG_TIPC is not set CONFIG_ATM=m CONFIG_ATM_CLIP=m @@ -2340,6 +2343,8 @@ CONFIG_MLX4_EN_DCB=y CONFIG_MLX4_EN_VXLAN=y CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y +CONFIG_MLX4_VNIC=m +# CONFIG_MLX4_VNIC_DEBUG is not set CONFIG_MLX5_CORE=m CONFIG_NET_VENDOR_MICREL=y # CONFIG_KS8842 is not set diff --git a/uek-rpm/ol6/config-x86_64-debug b/uek-rpm/ol6/config-x86_64-debug index 48dd3ec56abf..f721d7735a73 100644 --- a/uek-rpm/ol6/config-x86_64-debug +++ b/uek-rpm/ol6/config-x86_64-debug @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.1.5 Kernel Configuration +# Linux/x86 4.1.6 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1249,7 +1249,10 @@ CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set CONFIG_SCTP_COOKIE_HMAC_MD5=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y -# CONFIG_RDS is not set +CONFIG_RDS=m +CONFIG_RDS_RDMA=m +CONFIG_RDS_TCP=m +# CONFIG_RDS_DEBUG is not set # CONFIG_TIPC is not set CONFIG_ATM=m CONFIG_ATM_CLIP=m @@ -2332,6 +2335,8 @@ CONFIG_MLX4_EN_DCB=y CONFIG_MLX4_EN_VXLAN=y CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y +CONFIG_MLX4_VNIC=m +# CONFIG_MLX4_VNIC_DEBUG is not set CONFIG_MLX5_CORE=m CONFIG_NET_VENDOR_MICREL=y # CONFIG_KS8842 is not set diff --git a/uek-rpm/ol7/config-x86_64 b/uek-rpm/ol7/config-x86_64 index e4f88a489f18..ae52c940ccbe 100644 --- a/uek-rpm/ol7/config-x86_64 +++ b/uek-rpm/ol7/config-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.1.5 Kernel Configuration +# Linux/x86 4.1.6 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1262,7 +1262,10 @@ CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set CONFIG_SCTP_COOKIE_HMAC_MD5=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y -# CONFIG_RDS is not set +CONFIG_RDS=m +CONFIG_RDS_RDMA=m +CONFIG_RDS_TCP=m +# CONFIG_RDS_DEBUG is not set # CONFIG_TIPC is not set CONFIG_ATM=m CONFIG_ATM_CLIP=m @@ -2359,6 +2362,8 @@ CONFIG_MLX4_EN_DCB=y CONFIG_MLX4_EN_VXLAN=y CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y +CONFIG_MLX4_VNIC=m +# CONFIG_MLX4_VNIC_DEBUG is not set CONFIG_MLX5_CORE=m CONFIG_NET_VENDOR_MICREL=y # CONFIG_KS8842 is not set diff --git a/uek-rpm/ol7/config-x86_64-debug b/uek-rpm/ol7/config-x86_64-debug index 1be4d47d91d9..e576933bbd36 100644 --- a/uek-rpm/ol7/config-x86_64-debug +++ b/uek-rpm/ol7/config-x86_64-debug @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.1.5 Kernel Configuration +# Linux/x86 4.1.6 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1253,7 +1253,10 @@ CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set CONFIG_SCTP_COOKIE_HMAC_MD5=y CONFIG_SCTP_COOKIE_HMAC_SHA1=y -# CONFIG_RDS is not set +CONFIG_RDS=m +CONFIG_RDS_RDMA=m +CONFIG_RDS_TCP=m +# CONFIG_RDS_DEBUG is not set # CONFIG_TIPC is not set CONFIG_ATM=m CONFIG_ATM_CLIP=m @@ -2350,6 +2353,8 @@ CONFIG_MLX4_EN_DCB=y CONFIG_MLX4_EN_VXLAN=y CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y +CONFIG_MLX4_VNIC=m +# CONFIG_MLX4_VNIC_DEBUG is not set CONFIG_MLX5_CORE=m CONFIG_NET_VENDOR_MICREL=y # CONFIG_KS8842 is not set