Merged.
On 12/13/2016 11:55 AM, Christopher Covington wrote:
Enable Ethernet mode for the Mellanox ConnectX-4 (mlx5 driver), which some users may choose as a high-speed network interface.
Signed-off-by: Christopher Covington cov@codeaurora.org
SOURCES/config-centos-sig | 1 + SPECS/kernel-aarch64.spec | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/SOURCES/config-centos-sig b/SOURCES/config-centos-sig index 7cb8462..20bab07 100644 --- a/SOURCES/config-centos-sig +++ b/SOURCES/config-centos-sig @@ -10,3 +10,4 @@ CONFIG_I2C_DESIGNWARE_CORE=m CONFIG_I2C_DESIGNWARE_PLATFORM=m CONFIG_I2C_DESIGNWARE_PCI=m CONFIG_THUNDER_NIC_RGX=m +CONFIG_MLX5_CORE_EN=y diff --git a/SPECS/kernel-aarch64.spec b/SPECS/kernel-aarch64.spec index d510657..f781578 100644 --- a/SPECS/kernel-aarch64.spec +++ b/SPECS/kernel-aarch64.spec @@ -12,7 +12,7 @@ Summary: The Linux kernel
%define rpmversion 4.5.0 %define pkgrelease 15.el7 -%define centupdate 19.el7 +%define centupdate 20.el7
# allow pkg_release to have configurable %{?dist} tag %define specrelease %%SPECRELEASE%% @@ -1500,6 +1500,9 @@ fi %kernel_variant_files %{with_debug} kernel-debug debug
%changelog +* Tue Dec 13 2016 Christopher Covington cov@codeaurora.org [4.5.0-20.el7] +- Add Mellanox ConnectX-4 Ethernet support
- Mon Nov 21 2016 Jim Perrin jperrin@centos.org [4.5.0-19.el7]
- Add various ThunderX patches from arm-dev list.