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 8E32FA0540 for ; Thu, 7 Jul 2022 09:59:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8ADB5415D7; Thu, 7 Jul 2022 09:59:51 +0200 (CEST) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 6B07E406B4 for ; Thu, 7 Jul 2022 09:59:50 +0200 (CEST) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 4C8833F6FC for ; Thu, 7 Jul 2022 07:59:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180790; bh=MQWy0kE5ZPMSPOOjTZuNK5dmCRgBhw85F6o7tKAh2s4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=umMRt1ocBBzAilCEPDNWwuOz2PAqQ1Owhdq/H0SD3cXADOxTzM3rw7zVXOv8hojBc b0myv/RIWlIVBj/Gd+wN6OSkh6bSWJ4ezoVVky72181+8+GHTsCfgVoN7Rmw8prgzx t6HvzBDVCXZZpytdi1r7oWz9Ek4wjm6c+oGCKdS4of0Tn9PxCozSpmwHdlO523o/x/ Dl2mMSWMUKdbIUKaL06JNuXsSHu40o9xN6EMHbkTlOfVTcboCs2nJ6eF1njImia9dH CiZM+kcTGMVPxTZRENAnRbR5CoEL/WNJGNGDXTgpaJb9Nhc/LdWkLYrHRoGC7LG2qH ssTB67BNzNoHw== Received: by mail-ej1-f72.google.com with SMTP id hd35-20020a17090796a300b0072a707cfac4so4418726ejc.8 for ; Thu, 07 Jul 2022 00:59:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MQWy0kE5ZPMSPOOjTZuNK5dmCRgBhw85F6o7tKAh2s4=; b=OqthOoMikpgOf9fW9pNnRsnjWoCN3qr6UHZQM2lgBKLTJ1Taebv9UtmiHLNRDiTKlN oIPMe/HXNBLdZZrHblzVS5YaJ8jLS3Xx24/dosDYOqSv2l3WzVhy5CtflnpzoHuyhR2u zFD2JQpN4aXp+HSF93QAI5JgLvK0g4oe/7v7s0ZQIFfsa+xp8uieP5xE1rOhDi+oym4v myj755OmQ3J/MJIFcqiWgdk82xJ8MgUOTaQzTrQ53j5efOMFj8894FJJ4LGfzSVhfEOD wlHpG1Vuum36FQNjrCiGtdtDq/WcytfkbxbQB6JOvN+kiHEaCVHoRGeNPuGCHXNQllJ9 7Wsw== X-Gm-Message-State: AJIora9zzX898jiXCoO+pIsz54nzCmfOldW01Fqb/FFHT2GTBu+IFDoY X7sM+oSWfg1HD6qfd9+NGzrQlf5qbZKyEWbnDS/dK96Lw+6hAhnyGAqgT+xXPRhbchRD9iiVWh+ dhUKcnQ1JG0GTBl7smaCeqhmC X-Received: by 2002:a17:907:7f1d:b0:71d:ea75:e533 with SMTP id qf29-20020a1709077f1d00b0071dea75e533mr44664618ejc.78.1657180789822; Thu, 07 Jul 2022 00:59:49 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sxpzPk8hX4seS1E8d3mayr8yH4trn8gK1iFuuhausiTA9dtpSfhss7vA4042a+7l8evkfsXA== X-Received: by 2002:a17:907:7f1d:b0:71d:ea75:e533 with SMTP id qf29-20020a1709077f1d00b0071dea75e533mr44664600ejc.78.1657180789562; Thu, 07 Jul 2022 00:59:49 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id t23-20020a170906609700b006fed062c68esm18454842ejj.182.2022.07.07.00.59.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:59:48 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Thomas Monjalon Cc: dpdk stable Subject: patch 'kni: fix build' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:55:22 +0200 Message-Id: <20220707075522.194223-87-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 19.11.13 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/09/22. 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/47978fa1489abac299449fd51330c5c3a78a0d30 Thanks. Christian Ehrhardt --- >From 47978fa1489abac299449fd51330c5c3a78a0d30 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Mon, 6 Jun 2022 12:39:49 +0200 Subject: [PATCH] kni: fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 327ef5065996356e1a4b77fb93c85737c99bb8fe ] A previous fix had #else instead of #endif. The error message is: kernel/linux/kni/kni_net.c: In function ‘kni_net_rx_normal’: kernel/linux/kni/kni_net.c:448:2: error: #else after #else Bugzilla ID: 1025 Fixes: c98600d4bed6 ("kni: fix build with Linux 5.18") Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon --- kernel/linux/kni/kni_net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c index 1270c367d8..46f3f5d669 100644 --- a/kernel/linux/kni/kni_net.c +++ b/kernel/linux/kni/kni_net.c @@ -415,7 +415,7 @@ kni_net_rx_normal(struct kni_dev *kni) netif_rx_ni(skb); #else netif_rx(skb); -#else +#endif /* Update statistics */ dev->stats.rx_bytes += len; -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:14.697387942 +0200 +++ 0087-kni-fix-build.patch 2022-07-07 09:54:11.029825012 +0200 @@ -1 +1 @@ -From 327ef5065996356e1a4b77fb93c85737c99bb8fe Mon Sep 17 00:00:00 2001 +From 47978fa1489abac299449fd51330c5c3a78a0d30 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 327ef5065996356e1a4b77fb93c85737c99bb8fe ] + @@ -24 +26 @@ -index a8b092b756..41805fcabf 100644 +index 1270c367d8..46f3f5d669 100644 @@ -27 +29 @@ -@@ -445,7 +445,7 @@ kni_net_rx_normal(struct kni_dev *kni) +@@ -415,7 +415,7 @@ kni_net_rx_normal(struct kni_dev *kni)