From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 11AEDA09EE for ; Tue, 15 Dec 2020 13:56:19 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 09B37CA36; Tue, 15 Dec 2020 13:56:18 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 406DBCA36 for ; Tue, 15 Dec 2020 13:56:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608036973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tM1FKH5ZpuCsn0mr/AY/ysnCbjHVbTzQ1N+BDukIwCw=; b=DsDwFj/EAOCJ+DEKLNLT3UmGSsEXdcGzgYEHqU6sDyvo/vtUMwQKlV6/dPNBFCcM4GFKBD N0HrMlx5GklSpi01Fji5apMpA6hHve1VsqeO5txlVGJdI7UYkI5FDAaMhoip3EWQLL2X2f PDKhmUL0gA2cb5rU/iiWXFrepUcS1yY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-416-_bqoYyuKMtevW9UGLAOjNQ-1; Tue, 15 Dec 2020 07:56:11 -0500 X-MC-Unique: _bqoYyuKMtevW9UGLAOjNQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D3DD1E77C; Tue, 15 Dec 2020 12:56:09 +0000 (UTC) Received: from rh.redhat.com (ovpn-114-24.ams2.redhat.com [10.36.114.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 217445D6A1; Tue, 15 Dec 2020 12:56:07 +0000 (UTC) From: Kevin Traynor To: Olivier Matz Cc: Christophe Grosse , David Marchand , Ferruh Yigit , dpdk stable , Luca Boccassi Date: Tue, 15 Dec 2020 12:55:51 +0000 Message-Id: <20201215125553.59404-3-ktraynor@redhat.com> In-Reply-To: <20201215125553.59404-1-ktraynor@redhat.com> References: <20201215125553.59404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'kni: fix build on RHEL 8.3' has been queued to LTS release 18.11.11 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/16/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/dcd493e5059e4a2818e2df5b36179056184a7aae Thanks. Kevin. --- >From dcd493e5059e4a2818e2df5b36179056184a7aae Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Thu, 26 Nov 2020 15:23:45 +0100 Subject: [PATCH] kni: fix build on RHEL 8.3 [ upstream commit 95e0871929bfd9891545c9cbfe97119cb72390ba ] Like what was done for mainline kernel in commit 38ad54f3bc76 ("kni: fix build with Linux 5.6"), a new parameter 'txqueue' has to be added to 'ndo_tx_timeout' ndo on RHEL 8.3 kernel. Signed-off-by: Olivier Matz Tested-by: Christophe Grosse Tested-by: David Marchand Acked-by: Ferruh Yigit --- kernel/linux/kni/compat.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h index bf5e6e2b17..953b2cb614 100644 --- a/kernel/linux/kni/compat.h +++ b/kernel/linux/kni/compat.h @@ -122,5 +122,7 @@ #endif -#if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE +#if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE || \ + (defined(RHEL_RELEASE_CODE) && \ + RHEL_RELEASE_VERSION(8, 3) <= RHEL_RELEASE_CODE) #define HAVE_TX_TIMEOUT_TXQUEUE #endif -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-12-15 12:52:22.038740663 +0000 +++ 0003-kni-fix-build-on-RHEL-8.3.patch 2020-12-15 12:52:21.951978719 +0000 @@ -1 +1 @@ -From 95e0871929bfd9891545c9cbfe97119cb72390ba Mon Sep 17 00:00:00 2001 +From dcd493e5059e4a2818e2df5b36179056184a7aae Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 95e0871929bfd9891545c9cbfe97119cb72390ba ] + @@ -10,2 +11,0 @@ -Cc: stable@dpdk.org - @@ -21 +21 @@ -index d515b27669..5f65640d5e 100644 +index bf5e6e2b17..953b2cb614 100644 @@ -24 +24 @@ -@@ -132,5 +132,7 @@ +@@ -122,5 +122,7 @@