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 206BF43928 for ; Mon, 22 Jan 2024 13:19:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1B6C4410ED; Mon, 22 Jan 2024 13:19:42 +0100 (CET) Received: from mail-vk1-f228.google.com (mail-vk1-f228.google.com [209.85.221.228]) by mails.dpdk.org (Postfix) with ESMTP id 06A8D4028B for ; Mon, 22 Jan 2024 13:19:41 +0100 (CET) Received: by mail-vk1-f228.google.com with SMTP id 71dfb90a1353d-4b78b813dd0so588475e0c.3 for ; Mon, 22 Jan 2024 04:19:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1705925980; x=1706530780; darn=dpdk.org; h=cc:to:from:subject:message-id:date:from:to:cc:subject:date :message-id:reply-to; bh=siYuh0GGLcGbuPGncHVOhtz4JFcB9ditY3Si/B38Wfk=; b=iiEE8OLBI0fEcNwfNtNMPOeLWd7Y4Wuz3FVvsjB2iFFWxLA4Dc6GWXNcxTw93fPF3e eeEmduiXn+mTHA0gkauqtWeIgNrp/dnH6hLodQQdZIWZxPERbj4ugAUSUr7jcJG1e32x jCbpZIOo9qwzMDPn4s6Zo4evviCu2SPD8ssk8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705925980; x=1706530780; h=cc:to:from:subject:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=siYuh0GGLcGbuPGncHVOhtz4JFcB9ditY3Si/B38Wfk=; b=r3Qq89uXpCj+tlYK3d5/t88CFvd1gftpmJsHmkjqyzvmGrQpEulB0ei8SNEVyGbZG7 okqk7JJnXrP0kcovbw8gmoLknv26b/JYQDlfky86notEAqZDMZScsGNGs3pnlUWSc0ss ISaCE9AaXqEha3LNuBpFKha3jDA0N7FzT6vCmOexfkXjarsn+gq0BhbA5YSAN3g0/ihp RzrzzfwyYlNQVJeZVJtPx6U+2PssZyXsEIYWQjg4fnPnHXJjF1+3aMj3a4G/oB6pOd15 WkMpUKUU/qumS/RdYVDvvGMA9zm8uPah7WPNKKZsucnab8KDflxRlIgEZRCn7RFXEzOD ibGQ== X-Gm-Message-State: AOJu0Yw9q64BtwkgY05LyIFyXeZjnrAzJUgS/g8iWdcs25CkSuQeMPZ/ hqTCmAXfKUgHrrAGBehBSv7fQFD1/ex5hSMNEWBPBerdJtOBkGDPRYzn6aBtANO6PDVwV0sRjEV L1UoiX2fNECbuV+lD5TmI9bChxgPKyOl/8kUr1osm X-Google-Smtp-Source: AGHT+IFz+Zp+u6K3P7OJ3qWr59raTY1JymatisOOusWtdYenypQlD5EGsq0qn45FALrU1+YmHFqu2FMdc3lE X-Received: by 2002:a1f:4943:0:b0:4b6:be59:ebc5 with SMTP id w64-20020a1f4943000000b004b6be59ebc5mr1046683vka.30.1705925980414; Mon, 22 Jan 2024 04:19:40 -0800 (PST) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id ba35-20020a0561220ca300b004b73571fedfsm1050264vkb.12.2024.01.22.04.19.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2024 04:19:40 -0800 (PST) X-Relaying-Domain: iol.unh.edu Date: Mon, 22 Jan 2024 04:19:40 -0800 (PST) Message-ID: <65ae5d5c.050a0220.49de3.7289SMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.17.0.2] (unknown [172.18.0.217]) by postal.iol.unh.edu (Postfix) with ESMTP id F150C6052515; Mon, 22 Jan 2024 07:19:39 -0500 (EST) Subject: |WARNING| pw136031-136033 [PATCH] [v2, 3/3] dts: add API doc generation 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/136031 _apply patch failure_ Submitter: Juraj Linkes Date: Monday, January 22 2024 12:00:47 Applied on: CommitID:c858f006d1f7161986c88847259a400d8f80d81b Apply patch set 136031-136033 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 (515e1a4f4cddd33fcb35328a73449d30a8edfaf6) Done: main commit 515e1a4f4cddd33fcb35328a73449d30a8edfaf6 Trying to checkout branch: origin/next-baseband-for-main Checked out to next-baseband-for-main (c858f006d1f7161986c88847259a400d8f80d81b) Applying patch... Failed to apply patch: Applying: dts: add doc generation dependencies Using index info to reconstruct a base tree... M dts/poetry.lock M dts/pyproject.toml Falling back to patching base and 3-way merge... Auto-merging dts/pyproject.toml Auto-merging dts/poetry.lock CONFLICT (content): Merge conflict in dts/poetry.lock error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 dts: add doc generation dependencies 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 (c858f006d1f7161986c88847259a400d8f80d81b) Applying patch... Failed to apply patch: Applying: dts: add doc generation dependencies Using index info to reconstruct a base tree... M dts/poetry.lock M dts/pyproject.toml Falling back to patching base and 3-way merge... Auto-merging dts/pyproject.toml Auto-merging dts/poetry.lock CONFLICT (content): Merge conflict in dts/poetry.lock error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 dts: add doc generation dependencies 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/28930/ UNH-IOL DPDK Community Lab