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 2E862464CC for ; Tue, 1 Apr 2025 00:02:54 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EE88A402E1; Tue, 1 Apr 2025 00:02:53 +0200 (CEST) Received: from mail-pl1-f228.google.com (mail-pl1-f228.google.com [209.85.214.228]) by mails.dpdk.org (Postfix) with ESMTP id 5A623402B1 for ; Tue, 1 Apr 2025 00:02:52 +0200 (CEST) Received: by mail-pl1-f228.google.com with SMTP id d9443c01a7336-2240b4de12bso70240185ad.2 for ; Mon, 31 Mar 2025 15:02:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1743458571; x=1744063371; darn=dpdk.org; h=references:in-reply-to:cc:to:from:subject:message-id:date:from:to :cc:subject:date:message-id:reply-to; bh=Mg0yPCej48RZZ2Xs/2/6uR9Cx2W4xljehcMpzRRFycI=; b=Wxrqlyl8Riy3XYKFhMGOWnvgQNbuzX7vw7ikwfi+A9BI8ci0n/WGC46jRZJEt7GUu1 xAp6y8HrkgtyZxPFsBdRLbb4zrWilaoU41qhc1qVKsznKNcj0aqQ1oCSiD1WIMLg6xRy uTWH4MSdkdvTJ+ltJNbW/8i5iyLSsG47agpVg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743458571; x=1744063371; h=references:in-reply-to:cc:to:from:subject:message-id:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Mg0yPCej48RZZ2Xs/2/6uR9Cx2W4xljehcMpzRRFycI=; b=Lj1lHFQbwlWAIWiMaPqX7g2zYRmq0n+eY43dBBgs7COZn698tHJH4h5xAyRF9KG5ID yRnkyGaQ6HnAlFcyjpT1nLbKnK7RfXC7juldkaGcEvB2+CZM+4ZkkbD8gVP0JJQ/LKOU lYC71NUH1Ix2gtpqcpsF2ecc4dfYU7cG4L3lPzMklqqWkKPem9psQhMZrwzKZw99pTyW LCyfGH1f7tNlPDgZ8adSX7xwXrgOsuc0o6/x80xxYs2XNEpEAmpJIL9o/8XEZr1+v/p5 8a4ubAJ0JR2R0P3r8AlWzrHtb9NmuAJoO+rqohed4b+3vKwi/LuyUpMUKPmaC0RmA8s0 pkbA== X-Gm-Message-State: AOJu0YzNxGeDcWIruh1442Su3JoaoVH21jc2N9H1D4aXR8dTbMTT3w5f rlt/5yfTDdjXXjiyt8ln52v/SAnl9aE9WL6hU3iW9w45kMtLXj8nJ/UN8Ty9oMOFo96QJydKSuS TAu2wt3Lsz3Qrun6eWDeBleXRSFfa5U9B/n1SaVHv X-Gm-Gg: ASbGncs6tMjQ3qu8xFitfnCQFiviz54NBI42mA2qz2kWzNTx2n0qtxWMTgI+edKih+G CXVpAtSO+33Lbz1djjZqzZPi+lG79iM5wjNHr+gY0lRhprGUk8GVaMZ2RNYMPwcns8uVrqSkALh voEWorbRyLn4A70HOwA5nTAI1uSZCL0/XtfxNPPSNkt+s7GPKd3mOclFxhTEVlYFEHVbOY/qriD klLX4SNPYkbCTloHksJXbNRyNNrLdLr4F8JVAhi3SXiW5RE9hDdOPavAYWafnX0sUWcqRlNl9si owFpJaPaL0u1hPkRY/a7ZkyoEqTyR47n9Ojtnjgj X-Google-Smtp-Source: AGHT+IF9ExwZ0qPVqFRfT+MAUTTrtCtJVx4JAedCYR1le6iV1q0VPexca+wJzQesltPv/wx+96N281MA/I0d X-Received: by 2002:a17:902:da91:b0:224:191d:8a79 with SMTP id d9443c01a7336-2292f973a1fmr140014725ad.27.1743458571425; Mon, 31 Mar 2025 15:02:51 -0700 (PDT) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id 41be03b00d2f7-af93b8a7c36sm366957a12.27.2025.03.31.15.02.51 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Mar 2025 15:02:51 -0700 (PDT) X-Relaying-Domain: iol.unh.edu Date: Mon, 31 Mar 2025 15:02:51 -0700 (PDT) Message-ID: <67eb110b.050a0220.f9397.de79SMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.17.0.3] (unknown [172.18.0.217]) by postal.iol.unh.edu (Postfix) with ESMTP id 73AE56052471; Mon, 31 Mar 2025 18:02:50 -0400 (EDT) Subject: |WARNING| pw152688-152697 [PATCH] [10/10] raw/ifpga: use common base code build handling From: dpdklab@iol.unh.edu To: test-report@dpdk.org Cc: dpdk-test-reports@iol.unh.edu In-Reply-To: <20250331161000.9886-12-bruce.richardson@intel.com> References: <20250331161000.9886-12-bruce.richardson@intel.com> Content-Type: text/plain X-BeenThere: test-report@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: automatic DPDK test reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: test-report-bounces@dpdk.org Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/152697 _apply patch failure_ Submitter: Bruce Richardson Date: Monday, March 31 2025 16:10:00 Applied on: CommitID:edd3f4b1265e6da707c46ca9b6c39d332647baea Apply patch set 152688-152697 failed: Cloning the DPDK mirror at: https://github.com/DPDK/dpdk.git (Attempt 1 of 3) Trying to checkout branch: origin/main Checked out to main (edd3f4b1265e6da707c46ca9b6c39d332647baea) Done: main commit edd3f4b1265e6da707c46ca9b6c39d332647baea Trying to checkout branch: origin/next-net-for-main Checked out to next-net-for-main (f3cb237103aada7bc83fd3f40929fb6fb3e58c3b) Applying patch... Failed to apply patch: Applying: build: add generic support for base code in drivers Applying: common/sfc_efx: use common base code build handling Applying: net/hinic: use common base code build handling Applying: net/intel: use common base code build handling Using index info to reconstruct a base tree... M drivers/net/intel/e1000/meson.build M drivers/net/intel/fm10k/meson.build M drivers/net/intel/i40e/meson.build M drivers/net/intel/ice/base/meson.build M drivers/net/intel/idpf/meson.build M drivers/net/intel/ixgbe/meson.build Falling back to patching base and 3-way merge... Auto-merging drivers/net/intel/ixgbe/meson.build CONFLICT (content): Merge conflict in drivers/net/intel/ixgbe/meson.build Auto-merging drivers/net/intel/idpf/meson.build CONFLICT (content): Merge conflict in drivers/net/intel/idpf/meson.build Auto-merging drivers/net/intel/ice/base/meson.build Auto-merging drivers/net/intel/i40e/meson.build CONFLICT (content): Merge conflict in drivers/net/intel/i40e/meson.build Auto-merging drivers/net/intel/fm10k/meson.build CONFLICT (content): Merge conflict in drivers/net/intel/fm10k/meson.build Auto-merging drivers/net/intel/e1000/meson.build CONFLICT (content): Merge conflict in drivers/net/intel/e1000/meson.build error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0004 net/intel: use common base code build handling When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Trying to checkout branch: origin/main Checked out to main (edd3f4b1265e6da707c46ca9b6c39d332647baea) Applying patch... Failed to apply patch: Applying: build: add generic support for base code in drivers Applying: common/sfc_efx: use common base code build handling Applying: net/hinic: use common base code build handling Applying: net/intel: use common base code build handling Using index info to reconstruct a base tree... M drivers/net/intel/e1000/meson.build M drivers/net/intel/fm10k/meson.build M drivers/net/intel/i40e/meson.build M drivers/net/intel/ice/base/meson.build M drivers/net/intel/idpf/meson.build M drivers/net/intel/ixgbe/meson.build Falling back to patching base and 3-way merge... Auto-merging drivers/net/intel/ixgbe/meson.build CONFLICT (content): Merge conflict in drivers/net/intel/ixgbe/meson.build Auto-merging drivers/net/intel/idpf/meson.build CONFLICT (content): Merge conflict in drivers/net/intel/idpf/meson.build Auto-merging drivers/net/intel/ice/base/meson.build Auto-merging drivers/net/intel/i40e/meson.build CONFLICT (content): Merge conflict in drivers/net/intel/i40e/meson.build Auto-merging drivers/net/intel/fm10k/meson.build CONFLICT (content): Merge conflict in drivers/net/intel/fm10k/meson.build Auto-merging drivers/net/intel/e1000/meson.build CONFLICT (content): Merge conflict in drivers/net/intel/e1000/meson.build error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0004 net/intel: use common base code build handling When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". https://lab.dpdk.org/results/dashboard/patchsets/32915/ UNH-IOL DPDK Community Lab