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 A398145BB6 for ; Wed, 23 Oct 2024 23:21:58 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9E52543348; Wed, 23 Oct 2024 23:21:58 +0200 (CEST) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id 88D5C43348 for ; Wed, 23 Oct 2024 23:21:57 +0200 (CEST) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4315c1c7392so2172765e9.1 for ; Wed, 23 Oct 2024 14:21:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718517; x=1730323317; darn=dpdk.org; 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=C33ZXOxNgoJL1AoJKkQe1qFQ1fFuIx4irVSyNTye5/4=; b=KSqXx++NPsUxVIJPcs+vY8rnZYXrMA0jtdND53+ULfDySbsvWnt89zvDHGjax+OCjw u8/iHiBAvzn0pLZHCDw5Z/Cq9sedZWEgBFkhX0iltvOvmJE56gYecuFFE5T7DWnZFpNI 1O1CvLVztEj1/RWR6lcs6KnHTGivARCJ2IH8t1nhNI66SF4kxkBL87vnd9PgdKeWivKm 0bySmf2UvVYj3GgWJcD/D8xrUVykh45maUVuE9VqhTNH7t8Kwzz/XbvqAPM+xSgT6gat dWhsWhRMDpqC37d0ZV4Hur8T6LnXGQNJvn3+RNmFCssdeKO3KFJ+VEHz6RoR2FDjNhe+ VtkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718517; x=1730323317; 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=C33ZXOxNgoJL1AoJKkQe1qFQ1fFuIx4irVSyNTye5/4=; b=E+LiZdgsTRJWqbNMzOe1vZmx4jA9DmFVyRp4C9YlcZx6GfpYpESuNIP0Q7ybPMwJBC 5bY/Xjf/jaB+rU6CY5ibuWy9qtM2seryAQ5r3S9WcCa5VtWGcFxt+xcC9s+6R077bhm5 MffsruG+O1vkwXQxEsaZxXM/GP3zAO9FtneCXvV9d5/xjSN//07+Bn7fKHvObUdQ+hrM BoZefsY2IZ4CEUsaMb+JrRw26qeV4rsVvuvh3H0tvROGLDPpE8nAHgc/ex9OPO46uJX4 CULpOPeD/DB0mj5KmDSLnrvps7YmpazvQFn1Lpuig11x7owxzT2hvx6K0po7Z3B+JI0b yCCw== X-Gm-Message-State: AOJu0YzgttiUuHfYchDdg79akk1pkxoTK/BfHYGfVAgemdvIP+ismb9n W1vYKHTPb8dr4Z25TCsqqbHYTLt4HB7WsjOAXBLmRqxOtEnpBQzAOi3xpSw9 X-Google-Smtp-Source: AGHT+IELu2G1By0iil0ku3HCjRZSdNG8Q+v/NdWRBFYKh+NcxzIW/VGOfyHpOWWooFcF1ozVrTlDBw== X-Received: by 2002:a05:600c:1d1c:b0:431:47d4:19c7 with SMTP id 5b1f17b1804b1-43186222f94mr33739425e9.3.1729718516931; Wed, 23 Oct 2024 14:21:56 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ee0a4ad48sm9771170f8f.42.2024.10.23.14.21.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:21:56 -0700 (PDT) From: luca.boccassi@gmail.com To: Luca Boccassi Cc: dpdk stable Subject: patch 'net/ionic: fix build on Fedora Rawhide' has been queued to stable release 22.11.7 Date: Wed, 23 Oct 2024 22:16:59 +0100 Message-ID: <20241023211704.1216956-79-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241023211704.1216956-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-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 22.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/25/24. 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/8c1ee8e80c24b664280c2370f0a951460c18af88 Thanks. Luca Boccassi --- >From 8c1ee8e80c24b664280c2370f0a951460c18af88 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 23 Oct 2024 19:19:39 +0100 Subject: [PATCH] net/ionic: fix build on Fedora Rawhide Do not redefined already defined types. Not applicable to main, as it was fixed as part of a larger refactoring. Signed-off-by: Luca Boccassi --- drivers/net/ionic/ionic_osdep.h | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/drivers/net/ionic/ionic_osdep.h b/drivers/net/ionic/ionic_osdep.h index 68f767b920..db49f76a70 100644 --- a/drivers/net/ionic/ionic_osdep.h +++ b/drivers/net/ionic/ionic_osdep.h @@ -30,14 +30,28 @@ #define __iomem -typedef uint8_t u8; -typedef uint16_t u16; -typedef uint32_t u32; -typedef uint64_t u64; +#ifndef u8 +#define u8 uint8_t +#endif +#ifndef u16 +#define u16 uint16_t +#endif +#ifndef u32 +#define u32 uint32_t +#endif +#ifndef uint64_t +#define u64 uint64_t +#endif -typedef uint16_t __le16; -typedef uint32_t __le32; -typedef uint64_t __le64; +#ifndef __le16 +#define __le16 uint16_t +#endif +#ifndef __le32 +#define __le32 uint32_t +#endif +#ifndef __le64 +#define __le64 uint64_t +#endif #define ioread8(reg) rte_read8(reg) #define ioread32(reg) rte_read32(rte_le_to_cpu_32(reg)) -- 2.45.2