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 5387242ECF for ; Thu, 20 Jul 2023 17:21:26 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4FAB040685; Thu, 20 Jul 2023 17:21:26 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id C2BD4400D6 for ; Thu, 20 Jul 2023 17:21:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866484; 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=2UuYUlaQ6MIwYIkeJZ4TSWT6V9TfNX+CUqBLGSd7UgM=; b=VNBCOKPnVFArtvPepiaARGkM5rfi2XCzskUYzidCWCdjuLFo8l0Cq32HP/hhiXxJSHgaI2 B8yeZYQMEB0sY/dZ68JHOBDrVuu9nPjfKdEkg52Z42QeVItxTjUu/KBpQLFWPHkGygYLr9 3H3QnOPmSt1Qh5jDX+Np/VYiSqh4KVI= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-157-UPEkbJ7WPpumRYKZIiS26A-1; Thu, 20 Jul 2023 11:20:28 -0400 X-MC-Unique: UPEkbJ7WPpumRYKZIiS26A-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EE00B280018D; Thu, 20 Jul 2023 15:20:01 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D696492C13; Thu, 20 Jul 2023 15:20:00 +0000 (UTC) From: Kevin Traynor To: Philip Prindeville Cc: Anatoly Burakov , dpdk stable Subject: patch 'vfio: fix include with musl runtime' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:17:16 +0100 Message-ID: <20230720151942.262154-5-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.5 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/25/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/ae3de8c27c5ac11db88eaadae09e4d6d254289cb Thanks. Kevin --- >From ae3de8c27c5ac11db88eaadae09e4d6d254289cb 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 --- .mailmap | 1 + drivers/bus/pci/linux/pci_vfio.c | 1 + 2 files changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index c1b73055da..c94dacfdb1 100644 --- a/.mailmap +++ b/.mailmap @@ -1051,4 +1051,5 @@ Petr Houska Phanendra Vukkisala Phil Yang +Philip Prindeville Pierre Pfister Piotr Azarewicz diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c index cd0d0b1670..822aa41f9e 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -3,4 +3,5 @@ */ +#include #include #include -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:17:55.818025940 +0100 +++ 0005-vfio-fix-include-with-musl-runtime.patch 2023-07-20 16:17:54.427749552 +0100 @@ -1 +1 @@ -From c41a103c961ded5a0966652f4daf0a661a947352 Mon Sep 17 00:00:00 2001 +From ae3de8c27c5ac11db88eaadae09e4d6d254289cb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c41a103c961ded5a0966652f4daf0a661a947352 ] + @@ -9,2 +10,0 @@ -Cc: stable@dpdk.org - @@ -19 +19 @@ -index 0443e461a9..db85cc66c6 100644 +index c1b73055da..c94dacfdb1 100644 @@ -22 +22 @@ -@@ -1059,4 +1059,5 @@ Petr Houska +@@ -1051,4 +1051,5 @@ Petr Houska @@ -29 +29 @@ -index fab3483d9f..fe83e1a04e 100644 +index cd0d0b1670..822aa41f9e 100644