From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 405C2A0C45 for ; Thu, 10 Jun 2021 14:06:48 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B7C8940E64; Thu, 10 Jun 2021 14:06:47 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 03DDC4067C for ; Thu, 10 Jun 2021 14:06:47 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lrJSQ-0008O2-PT; Thu, 10 Jun 2021 12:06:46 +0000 From: Christian Ehrhardt To: Christian Ehrhardt Cc: dpdk stable Date: Thu, 10 Jun 2021 14:05:50 +0200 Message-Id: <20210610120641.885862-2-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210610120641.885862-1-christian.ehrhardt@canonical.com> References: <20210610120641.885862-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'Revert "kni: fix compilation on SLES15-SP3"' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/12/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/d1610c3b793e8458c9392f4f5dffe02f40d400cb Thanks. Christian Ehrhardt --- >From d1610c3b793e8458c9392f4f5dffe02f40d400cb Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Thu, 10 Jun 2021 10:24:05 +0200 Subject: [PATCH] Revert "kni: fix compilation on SLES15-SP3" This reverts commit de7bca5de2e3d605ef9977bd6eba8aa565af01fd. It was found that this breaks other SUSE versions. We will pick the final fix from main once we have it. --- kernel/linux/kni/compat.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h index 70e014fd1d..5f65640d5e 100644 --- a/kernel/linux/kni/compat.h +++ b/kernel/linux/kni/compat.h @@ -133,9 +133,7 @@ #if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE || \ (defined(RHEL_RELEASE_CODE) && \ - RHEL_RELEASE_VERSION(8, 3) <= RHEL_RELEASE_CODE) || \ - (defined(CONFIG_SUSE_KERNEL) && \ - KERNEL_VERSION(5, 3, 18) <= LINUX_VERSION_CODE) + RHEL_RELEASE_VERSION(8, 3) <= RHEL_RELEASE_CODE) #define HAVE_TX_TIMEOUT_TXQUEUE #endif -- 2.31.1