From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id C3B142B8E for ; Thu, 16 Feb 2017 05:37:49 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Feb 2017 20:37:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,167,1484035200"; d="scan'208";a="1127795363" Received: from yliu-dev.sh.intel.com (HELO yliu-dev) ([10.239.67.162]) by fmsmga002.fm.intel.com with ESMTP; 15 Feb 2017 20:37:47 -0800 Date: Thu, 16 Feb 2017 12:40:02 +0800 From: Yuanhan Liu To: Shahaf Shuler Cc: stable@dpdk.org, nelio.laranjeiro@6wind.com, adrien.mazarguil@6wind.com Message-ID: <20170216044002.GZ20916@yliu-dev.sh.intel.com> References: <1487146031-55218-1-git-send-email-shahafs@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1487146031-55218-1-git-send-email-shahafs@mellanox.com> User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [dpdk-stable] [PATCH] net/mlx5: fix link status query X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Feb 2017 04:37:50 -0000 On Wed, Feb 15, 2017 at 10:07:11AM +0200, Shahaf Shuler wrote: > [ backported from upstream commit 3a49ffe38a9508c57343719e5272e585c8dbd96c ] > > Trying to query the link status through the new ETHTOOL_GLINKSETTINGS > ioctl available since Linux 4.5 was always failing due to a kernel bug > fixed since version 4.9. > > This commit also addresses a common issue where the headers version used > at compile time differs from that of the kernel on the target system, by > always defining missing symbols and moving the kernel version check at run > time. > > Fixes: 188408719888 ("net/mlx5: fix support for newer link speeds") > CC: stable@dpdk.org > > Signed-off-by: Shahaf Shuler > Acked-by: Adrien Mazarguil > --- > strangely i didn't had any conflicts. please let me know if you are encounter one. My scripts first run "git format-patch", do some edits (like adding the original commit info), then run "git am" to apply it. It failed. I then tried "git cherry-pick" just now, as you stated, yes, it works. Rerun "git am -3" shows that the conflict could be auto resolved. So anyway, thanks for the backport! It's been queued to my local 16.11 branch, and it will be pushed to dpdk.org this Sat. if I got no objections. --yliu