From 2b3f18529474a2a9c8e37401ab818a313a7452a9 Mon Sep 17 00:00:00 2001 From: fduwjj Date: Wed, 18 Jan 2023 17:42:27 +0000 Subject: [PATCH 1/2] Reorder structure for compatibility with linux-6.0 [ghstack-poisoned] --- gloo/common/linux.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gloo/common/linux.cc b/gloo/common/linux.cc index c5e6c887b..423de67b0 100644 --- a/gloo/common/linux.cc +++ b/gloo/common/linux.cc @@ -193,8 +193,8 @@ static int getInterfaceSpeedGLinkSettings(int sock, struct ifreq* ifr) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,6,0) constexpr auto link_mode_data_nwords = 3 * 127; struct { - struct ethtool_link_settings req; __u32 link_mode_data[link_mode_data_nwords]; + struct ethtool_link_settings req; } ecmd; int rv; From 11f624fe0969deb6c7d917505d3d17834e92ee91 Mon Sep 17 00:00:00 2001 From: fduwjj Date: Wed, 18 Jan 2023 18:42:46 +0000 Subject: [PATCH 2/2] Update on "Reorder structure for compatibility with linux-6.0" See https://github.com/facebookincubator/gloo/pull/346. [ghstack-poisoned] --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b0db65e69..8aa8fb9a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(gloo CXX C) set(GLOO_VERSION_MAJOR 0) set(GLOO_VERSION_MINOR 5) -set(GLOO_VERSION_PATCH 0) +set(GLOO_VERSION_PATCH 1) set(GLOO_VERSION "${GLOO_VERSION_MAJOR}.${GLOO_VERSION_MINOR}.${GLOO_VERSION_PATCH}")