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 C72E343B5B for ; Wed, 21 Feb 2024 09:12:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AD5E4402ED; Wed, 21 Feb 2024 09:12:03 +0100 (CET) Received: from mail-yw1-f228.google.com (mail-yw1-f228.google.com [209.85.128.228]) by mails.dpdk.org (Postfix) with ESMTP id 017C8402B9 for ; Wed, 21 Feb 2024 09:12:02 +0100 (CET) Received: by mail-yw1-f228.google.com with SMTP id 00721157ae682-607d8506099so62255977b3.0 for ; Wed, 21 Feb 2024 00:12:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1708503122; x=1709107922; darn=dpdk.org; h=cc:to:from:subject:message-id:date:from:to:cc:subject:date :message-id:reply-to; bh=X9+bfXNXvIrXK6YStMpuJUFXNwB2CWc7HT3ab1z9m2c=; b=bQFBNTWbYhN4g2KEejm8k+3r0pTJm6OUCzZIksIwts+0ABuNRrbQgin5Wjiq6XuXO9 SNvwpy+qWS2IZqVTr9AUIWpV5OgsLvekFADuiZdNYlRe6hionNq79XehRWBOeGKJ1k8s nvUIGMzAt7LE2hlYg5bx11K/ezn8ylqtd8QeQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708503122; x=1709107922; h=cc:to:from:subject:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=X9+bfXNXvIrXK6YStMpuJUFXNwB2CWc7HT3ab1z9m2c=; b=Q3AzQlStZ6ypKTZHXSwV/A1oOgqkFBCim2lpn3ZtuAy09EteBoFmc1484qvHHFrpcC nUEOutvtj0vSJrwyXPtKINFVB6Y4zSh7Szt+ZZRTSsJYeFwtBS5+oWyX474CIwrtGAu0 0ERLT69KO/+ASJP1YrusHNqIFvfwFq1PNYkbf3jJ0t7GRNU/zLLu15w/abqb4K5T0wFK SZem86edA2Kd22mgy8VhuoIBanLraMcuUcC2jZxxrXs6iAGYp85brfHTvs2Xd7TT6/yo oCoauQO1Rxo8rQNk3gr+24qeYl9vU0I1JZ+cS3431Ovevo7JDmxUa2SHGaU3DlsMNHuk 9YYw== X-Gm-Message-State: AOJu0YxMq/oRodNt31PCg+pYfpU3ZTjO9Yi4B7U2ASueLMa8mR7O9b+l iIeuOvs0AR2afWLgAHqiBY+RedoRlNMc592he9ZqtFpYnoAVrrwNZm/NWdjXzeAS+55iWdbWqfZ xkMBIzEstwHoyVnPvfb0bqktcQZKYiGy+kvqFzUeV X-Google-Smtp-Source: AGHT+IEOMF1Ds+sMQQWN3+BNsyPoTnHFokcCSB5BgSIfGkeB9tWm3SOdakl10CHgr8jLdcqN1+xL494VozAS X-Received: by 2002:a05:690c:a81:b0:607:b85e:2d21 with SMTP id ci1-20020a05690c0a8100b00607b85e2d21mr18636010ywb.24.1708503122374; Wed, 21 Feb 2024 00:12:02 -0800 (PST) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id a65-20020a0dd844000000b00604a1811e45sm186086ywe.48.2024.02.21.00.12.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Feb 2024 00:12:02 -0800 (PST) X-Relaying-Domain: iol.unh.edu Date: Wed, 21 Feb 2024 00:12:02 -0800 (PST) Message-ID: <65d5b052.0d0a0220.e745c.bb81SMTPIN_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 0A91E6052510; Wed, 21 Feb 2024 03:12:02 -0500 (EST) Subject: |WARNING| pw136948 [PATCH] [v3] common/qat: add virtual qat device (vQAT) From: dpdklab@iol.unh.edu To: test-report@dpdk.org Cc: dpdk-test-reports@iol.unh.edu 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/136948 _apply patch failure_ Submitter: Arkadiusz Kusztal Date: Wednesday, February 21 2024 07:50:11 Applied on: CommitID:92d644f1d58838561d0996b2d4a9f5d276e41651 Apply patch set 136948 failed: Cloning the DPDK mirror at: https://github.com/DPDK/dpdk.git (Attempt 1 of 3) Trying to checkout branch: main Checked out to main (92d644f1d58838561d0996b2d4a9f5d276e41651) Done: main commit 92d644f1d58838561d0996b2d4a9f5d276e41651 Trying to checkout branch: origin/next-crypto-for-main Checked out to next-crypto-for-main (92d644f1d58838561d0996b2d4a9f5d276e41651) Applying patch... Failed to apply patch: Applying: common/qat: add virtual qat device (vQAT) Using index info to reconstruct a base tree... M doc/guides/rel_notes/release_24_03.rst M drivers/common/qat/qat_adf/icp_qat_hw.h Falling back to patching base and 3-way merge... Auto-merging drivers/common/qat/qat_adf/icp_qat_hw.h Auto-merging doc/guides/rel_notes/release_24_03.rst CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 common/qat: add virtual qat device (vQAT) 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: main Checked out to main (92d644f1d58838561d0996b2d4a9f5d276e41651) Applying patch... Failed to apply patch: Applying: common/qat: add virtual qat device (vQAT) Using index info to reconstruct a base tree... M doc/guides/rel_notes/release_24_03.rst M drivers/common/qat/qat_adf/icp_qat_hw.h Falling back to patching base and 3-way merge... Auto-merging drivers/common/qat/qat_adf/icp_qat_hw.h Auto-merging doc/guides/rel_notes/release_24_03.rst CONFLICT (content): Merge conflict in doc/guides/rel_notes/release_24_03.rst error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 common/qat: add virtual qat device (vQAT) 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/29207/ UNH-IOL DPDK Community Lab