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 284CB42CBC for ; Thu, 15 Jun 2023 03:33:09 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2365442D10; Thu, 15 Jun 2023 03:33:09 +0200 (CEST) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mails.dpdk.org (Postfix) with ESMTP id 5AC2B40E0F for ; Thu, 15 Jun 2023 03:33:07 +0200 (CEST) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-3f8d2bfed53so1758745e9.1 for ; Wed, 14 Jun 2023 18:33:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686792787; x=1689384787; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KKlM0ZlqljpkxtQK7GlOgaWrAweuqLUfXYFtU+nIpfg=; b=BSP2A4pjv/SFpeDzdLyEMFAveYr4DZy2S7Abvm3m+ZVNGRfrr4mr6LIeduCez9vVgq Ea/nq5yWvdd7U7sNv8v5OCHiosks48XyEeIV7U6lx2IFTms5K1OVj7lipilXNvZnlkJL gz66Xpw2pqkB9HfSzEz6/CQvzz9k5w/TKsXtzoXb5nTrRvrBPVCFW71JrwiXcsOZSVz+ hYrD8N8nH7636tbQ3Z0NbQ31egeXEks3xNVq2pAH91Fzgx391+uLzngysXrcbqB8EmYJ U3bK7y1RV7SuEuk4B2zI662eE0dpsH2uH6XDzbYCV44pbFtDWXjkcFD+HAaZI1dUywFQ L4tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686792787; x=1689384787; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KKlM0ZlqljpkxtQK7GlOgaWrAweuqLUfXYFtU+nIpfg=; b=IG7VhPPpdQwa98za0g1lH82M1rWX8pyO/Vw/vEHz1zuUaX/5Q0MeT4So+3cyq7SUvg OjQX8Esg/yyuhfYS7+Ba91ddb+oL8nSN5JrKqfjxXx4GxUwbsb1pA5lAfbOk8hm1vJI7 aDZ9zk/6WYCla3vgVk0lr1CHp89bhsZJIeadPvTLoHIth62M3mOf8oGpOkhGwBc9kp4h qrUcLdRARq74cR6j6pPo+hrCvhDUr6MHL2k1xYpoTE6JjT3tbHHmAt5lVwzr+2oB48l9 3vIIHab6DrspE9MPpxEWQUYcdeDsHF+g3YTSY52slMzT/3o/Np/SlLdzgSJAEBkujAI3 yKzg== X-Gm-Message-State: AC+VfDyKz0VElJ4mKV7Wa5rZkS4JBpKCGFwLFriEWTzQ8W8een6EPiHm 19Lgkhn/N+GgA5RKA0TY8aWmuHCLkXO3CA== X-Google-Smtp-Source: ACHHUZ69sebunboJEpnkuXraIQ1P1vVTsriRDB8lfdoVNS9PPLO+br4sRZ0cB7a5YY2YArf9u5Gbwg== X-Received: by 2002:a05:600c:2197:b0:3f6:d90:3db with SMTP id e23-20020a05600c219700b003f60d9003dbmr2706433wme.3.1686792786899; Wed, 14 Jun 2023 18:33:06 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id q9-20020a7bce89000000b003f858ae8f9dsm8539163wmj.31.2023.06.14.18.33.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 18:33:06 -0700 (PDT) From: luca.boccassi@gmail.com To: Philip Prindeville Cc: Anatoly Burakov , dpdk stable Subject: patch 'vfio: fix include with musl runtime' has been queued to stable release 20.11.9 Date: Thu, 15 Jun 2023 02:32:00 +0100 Message-Id: <20230615013258.1439718-5-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230615013258.1439718-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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 20.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/17/23. 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/550db8485a8bd634c4a5460118bb0d17a592fdee Thanks. Luca Boccassi --- >From 550db8485a8bd634c4a5460118bb0d17a592fdee Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Sat, 20 May 2023 12:07:30 -0600 Subject: [PATCH] vfio: fix include with musl runtime [ upstream commit c41a103c961ded5a0966652f4daf0a661a947352 ] pread64() and pwrite64() are declared in in MUSL and other (i.e. not glibc) C runtimes. Signed-off-by: Philip Prindeville Acked-by: Anatoly Burakov --- drivers/bus/pci/linux/pci_vfio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c index a4ce51be7b..3b3a548352 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -2,6 +2,7 @@ * Copyright(c) 2010-2014 Intel Corporation */ +#include #include #include #include -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-15 01:56:35.016317590 +0100 +++ 0005-vfio-fix-include-with-musl-runtime.patch 2023-06-15 01:56:34.491539643 +0100 @@ -1 +1 @@ -From c41a103c961ded5a0966652f4daf0a661a947352 Mon Sep 17 00:00:00 2001 +From 550db8485a8bd634c4a5460118bb0d17a592fdee Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c41a103c961ded5a0966652f4daf0a661a947352 ] + @@ -9,2 +10,0 @@ -Cc: stable@dpdk.org - @@ -14 +13,0 @@ - .mailmap | 1 + @@ -16 +15 @@ - 2 files changed, 2 insertions(+) + 1 file changed, 1 insertion(+) @@ -18,12 +16,0 @@ -diff --git a/.mailmap b/.mailmap -index 0443e461a9..db85cc66c6 100644 ---- a/.mailmap -+++ b/.mailmap -@@ -1058,6 +1058,7 @@ Peter Spreadborough - Petr Houska - Phanendra Vukkisala - Phil Yang -+Philip Prindeville - Pierre Pfister - Piotr Azarewicz - Piotr Bartosiewicz @@ -31 +18 @@ -index fab3483d9f..fe83e1a04e 100644 +index a4ce51be7b..3b3a548352 100644