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 6893D43C21 for ; Thu, 7 Mar 2024 21:32:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AB4DA402BA; Thu, 7 Mar 2024 21:32:36 +0100 (CET) Received: from mail-il1-f226.google.com (mail-il1-f226.google.com [209.85.166.226]) by mails.dpdk.org (Postfix) with ESMTP id 365BF40272 for ; Thu, 7 Mar 2024 21:32:35 +0100 (CET) Received: by mail-il1-f226.google.com with SMTP id e9e14a558f8ab-36523b9fa11so245555ab.3 for ; Thu, 07 Mar 2024 12:32:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1709843554; x=1710448354; 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=bxVC99mQjdQTRu/o10uFIQlW76C46xpiYm+9fag5xJE=; b=gdHYMmCr2okchLXafR+wsIybCuIMXEPkUYMucnueNLC55engE0IuGsZmtpAI87wtg8 bKZm2cFx6oFv9ELuNWN19bFssFWB/Z0JpfyaeXhs81Fx3lKV8vkIX7GYwcZECXo+qMZr w84nQOmgGPEwhpI7vuJOMxp5o13He1SsPpCGk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709843554; x=1710448354; 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=bxVC99mQjdQTRu/o10uFIQlW76C46xpiYm+9fag5xJE=; b=rhe2aedJ9YO0sUKxSCIpIuBrUU1qxZafgtgRx62SuPB5Fl2XU9M6W4vjLkgA5WjNdk 3UKQJ26mmNWMX4MU6JlQbQdzxLtdZMEZzAW8MCGDA2JMBbeiQVtjTrdo3b/jqL9GH1cN EWBTsitxWeb6JP90n0VpqN9dwy8FU55X+6S+x8VrG5A21qaA8u9AjK6hlcWLMJDUwFrL G1eyCjRNp1eBsCZFyaZDPjm5Jl7BzAxgAhsIj3PtYMd9P6+9cJ9QI9LhmcbCnCZC/PJm 91TBiGGpN8agEMXZi+u+N7PvJAwYyBpfSUZv/yDjOJpwWsA8PRACFwRasH2LaWjfcPlZ Yy9g== X-Gm-Message-State: AOJu0YxBltZ02XNviRGRa7zLu1IbCt+BPTbxRkpZAp5EefXw+w67B4IW Q/Ddc6177fMB0XGeq9dAQ8XnpqwlJiijIga3EBnSYr3T/oXhvrhBhsceRFdZ/tcTI+eXli6o7K1 ITrhrbhT/ydQkiNWGsBi4D8Og0wBV6ysDLgXsLrRyqF1N6Zhw+tqML1hB X-Google-Smtp-Source: AGHT+IE1nmJXbXxmIarxgOhG6wGYMvR/PokEBcUbdXeAbn8X/i0RKYp/CEvWQDUohVhSlz5ItzNL55eeGNeE X-Received: by 2002:a05:6e02:1a8c:b0:365:21f4:701f with SMTP id k12-20020a056e021a8c00b0036521f4701fmr26439375ilv.21.1709843554542; Thu, 07 Mar 2024 12:32:34 -0800 (PST) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [2606:4100:3880:1234::84]) by smtp-relay.gmail.com with ESMTPS id cr3-20020a056e023a8300b0036450d62d08sm747892ilb.54.2024.03.07.12.32.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Mar 2024 12:32:34 -0800 (PST) X-Relaying-Domain: iol.unh.edu Date: Thu, 07 Mar 2024 12:32:34 -0800 (PST) Message-ID: <65ea2462.050a0220.e3b4c.eaa7SMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.17.0.6] (unknown [172.18.0.217]) by postal.iol.unh.edu (Postfix) with ESMTP id 9D38A6043484; Thu, 7 Mar 2024 15:32:33 -0500 (EST) Subject: |WARNING| pw138109 [PATCH] [v4] hash: put GFNI stubs back From: dpdklab@iol.unh.edu To: test-report@dpdk.org Cc: dpdk-test-reports@iol.unh.edu In-Reply-To: <20240307191545.26452-1-stephen@networkplumber.org> References: <20240307191545.26452-1-stephen@networkplumber.org> 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/138109 _apply patch failure_ Submitter: Stephen Hemminger Date: Thursday, March 07 2024 19:14:59 Applied on: CommitID:6bd7a4b20c17a7a26277c2590816413dd48691d4 Apply patch set 138109 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 (6bd7a4b20c17a7a26277c2590816413dd48691d4) Done: main commit 6bd7a4b20c17a7a26277c2590816413dd48691d4 Trying to checkout branch: origin/main Checked out to main (6bd7a4b20c17a7a26277c2590816413dd48691d4) Applying patch... Failed to apply patch: Applying: hash: put GFNI stubs back Using index info to reconstruct a base tree... M lib/hash/rte_thash_gfni.c M lib/hash/rte_thash_gfni.h M lib/hash/version.map Falling back to patching base and 3-way merge... Auto-merging lib/hash/version.map CONFLICT (content): Merge conflict in lib/hash/version.map Auto-merging lib/hash/rte_thash_gfni.h CONFLICT (content): Merge conflict in lib/hash/rte_thash_gfni.h Auto-merging lib/hash/rte_thash_gfni.c CONFLICT (content): Merge conflict in lib/hash/rte_thash_gfni.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 hash: put GFNI stubs back 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/29467/ UNH-IOL DPDK Community Lab