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 0B7EAA04DB for ; Mon, 30 Nov 2020 12:50:53 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0352B4C93; Mon, 30 Nov 2020 12:50:52 +0100 (CET) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id EEBB84C93 for ; Mon, 30 Nov 2020 12:50:49 +0100 (CET) Received: by mail-wm1-f65.google.com with SMTP id g185so16680302wmf.3 for ; Mon, 30 Nov 2020 03:50:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=V0rqTcq17egOoe05SS3n/Z+3pNoxkMj0vg0UBetJqkI=; b=lcpXYll+pKTTeNOsytypYYsPhYoZgGFr4wSA6MUDBAHlUYO++/V/CX8swFAv5i5EIp Z+2NPjRnzyFm30eR/j+pUnDD7JOgPjIj7EL5FhNCicsq5s/wOVrZMZQB05Cr9SP89iom sMZU8+Kw63tzVg6W45fbVQ1+YE1t7bL6Y/jY5EjtYiMUFcq5gzf42LcyhFbLdzn17qsy M0LFvwEfD9d/KGycNEWEHy1t4JhamqxugDwRffI0Zg2MWh2VhwdrJu2m81Emo5lzitWb ooSwjNA9HHzNoc9Vz/CU4BpQhCGZkbruHn+C/x6MztdHFnxu7YuisFSfwLpu7f6CIKwy 7H1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=V0rqTcq17egOoe05SS3n/Z+3pNoxkMj0vg0UBetJqkI=; b=QBPiZpGHBxnZzZD4olZJHoCO2man0SfjeYZvbX3qwLaw7QNBnURTBGOdIRHbp8DBFd i7vhjkwoz4eZ4Lp50z51IuXcuqSHfHaF1ESTluuR6hJOt7SnZMXCHXRpqUvppkPR3Fco G4q7jRw80vQQxDnlYAqIPo60vJ/OyXpYOBpFKr+z3JW1Z69GiY0bOK7S8E6Zt+DW8EqK iQ17x5NEzQvdAVPS7bWGoBr2rQY/iTI6CjttpjfVQOYmdCnqRR0kqRMSwOCb4xGmMPKV FLa1A8/v/sJPijDkhSko92hNxig6CWvhCXg2wv53/cul8br74p5Ca54c3UrMvH1fwQEE JX4Q== X-Gm-Message-State: AOAM533otXLMUvDX/SaeFVGfs6Tdao/QvMB6LDXgQzm5J5VndPe4543I OdP1sXbMo/O2jtyptLRaWoFdaRMejV1Q7A== X-Google-Smtp-Source: ABdhPJxxmXEFixQn75JGweqhZRCIs+iFYabGS3JTm6DJIrcpAJS4jSvFqPNx5Ec5h3bW+6+XTtDKow== X-Received: by 2002:a7b:c8da:: with SMTP id f26mr7431446wml.155.1606737048719; Mon, 30 Nov 2020 03:50:48 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id f7sm5056003wmc.1.2020.11.30.03.50.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Nov 2020 03:50:48 -0800 (PST) From: luca.boccassi@gmail.com To: Olivier Matz Cc: Christophe Grosse , David Marchand , Ferruh Yigit , dpdk stable Date: Mon, 30 Nov 2020 11:50:24 +0000 Message-Id: <20201130115027.64046-6-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201130115027.64046-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> <20201130115027.64046-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'kni: fix build on RHEL 8.3' has been queued to stable release 19.11.6 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 stable release 19.11.6 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/02/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/71aab0b2d49cf18c0320753734615c618c03f347 Thanks. Luca Boccassi --- >From 71aab0b2d49cf18c0320753734615c618c03f347 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 d515b27669..5f65640d5e 100644 --- a/kernel/linux/kni/compat.h +++ b/kernel/linux/kni/compat.h @@ -131,7 +131,9 @@ #define HAVE_IOVA_TO_KVA_MAPPING_SUPPORT #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.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-30 11:49:30.584253718 +0000 +++ 0006-kni-fix-build-on-RHEL-8.3.patch 2020-11-30 11:49:30.402271747 +0000 @@ -1 +1 @@ -From 95e0871929bfd9891545c9cbfe97119cb72390ba Mon Sep 17 00:00:00 2001 +From 71aab0b2d49cf18c0320753734615c618c03f347 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 95e0871929bfd9891545c9cbfe97119cb72390ba ] + @@ -9,2 +10,0 @@ - -Cc: stable@dpdk.org