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 C366243B67 for ; Wed, 21 Feb 2024 22:59:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B965540297; Wed, 21 Feb 2024 22:59:24 +0100 (CET) Received: from mail-pl1-f228.google.com (mail-pl1-f228.google.com [209.85.214.228]) by mails.dpdk.org (Postfix) with ESMTP id C844C4013F for ; Wed, 21 Feb 2024 22:59:23 +0100 (CET) Received: by mail-pl1-f228.google.com with SMTP id d9443c01a7336-1d94b222a3aso10741125ad.2 for ; Wed, 21 Feb 2024 13:59:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1708552763; x=1709157563; darn=dpdk.org; h=cc:to:from:subject:message-id:date:from:to:cc:subject:date :message-id:reply-to; bh=BjK76d4YKNZMzljk/NEXD+kAnFWZOZZhQ5u8zAmE4jw=; b=dpUvkuk2K2OcQ4+gFzaAdWXgX/KkTP3RZ1Dc0MKj8HmzinUVqJ5w4QpRFW2u4IfH0C /OL68SF9Nl2fr/p+/eqdwmE+2SyjKhhFaTwMK+q2cSNGck6oYZGo4ScdtLEu2zcgTrVN zN9V2jabhtp+Fam9j9/izfDaP4//JkYcoW4cM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708552763; x=1709157563; h=cc:to:from:subject:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BjK76d4YKNZMzljk/NEXD+kAnFWZOZZhQ5u8zAmE4jw=; b=RtQXa/3j347iZB3FMAx+QxuQPOlJtHjbeOd5Nba48s0LpeEIzpjd7bJ/fPtqBxtORC vlhFckHEw3Ist9k5PTnwRLfZDrhE+0Yg0f2oL6/xEi9N95C+G5TA4zW1ydkNGkgSeG8j hpPYKWnIHukjt7hn2h7ghDpwyeeKQVYd2e12Er/KsOzkHVQ75qNRY7QV5KxE3jRlTWMl myS1CE5366PmEIsFiDtsE1UR3j/7reCv90I6ENSHNqDbZupNu0h5cfz56vYZj/bgUrq7 dnTjAUKHzyHZCLmA7ub5suIgXiHa/6rkzOcMkYzVZOH2uZuMX6y2Wx5tcEhb/yc4E8Jq YZYA== X-Gm-Message-State: AOJu0YyDKUgauc5e24uL2Zu1QISFuZa89xPscrMWuogrPUWnZuOeiJuv D7/RhPYYrJGr8lZzne4r6EpJCA9ZmZqSZDvrd4+8aCg16SgjdTx9z8gDzt0FcJlYnP31L0Dmnjq F/rK68zAp9yFJSdjxTzQ+UcjoJWbuu+eq+wQozSJqOpz5xphwV3EI2lqf X-Google-Smtp-Source: AGHT+IGNwK2gl1rgOXeEehstARe+8M1laGyG6AWnC8tYN5plzb1OZdWYTYliBQHGU5K0FPdWXFNV8fNiXIjz X-Received: by 2002:a17:903:11c3:b0:1d7:5943:21b8 with SMTP id q3-20020a17090311c300b001d7594321b8mr28687863plh.16.1708552762997; Wed, 21 Feb 2024 13:59:22 -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 jc20-20020a17090325d400b001dba739d18bsm186617plb.88.2024.02.21.13.59.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Feb 2024 13:59:22 -0800 (PST) X-Relaying-Domain: iol.unh.edu Date: Wed, 21 Feb 2024 13:59:22 -0800 (PST) Message-ID: <65d6723a.170a0220.13619.adc4SMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.21.0.5] (unknown [172.18.0.240]) by postal.iol.unh.edu (Postfix) with ESMTP id 297166043300; Wed, 21 Feb 2024 16:59:22 -0500 (EST) Subject: |WARNING| pw136978-136987 [PATCH] [10/10] doc: update release notes for bnxt 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/136978 _apply patch failure_ Submitter: Ajit Khaparde Date: Wednesday, February 21 2024 21:20:45 Applied on: CommitID:c5af8a22cc7a073efa45fbcd8448ba1ad8f386be Apply patch set 136978-136987 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-net-brcm-for-next-net Checked out to next-net-brcm-for-next-net (c5af8a22cc7a073efa45fbcd8448ba1ad8f386be) Applying patch... Failed to apply patch: Applying: net/bnxt: extend long bd check for VXLAN GPE Applying: net/bnxt: add dual rate module detection log Applying: net/bnxt: increase queue size for async handling Applying: net/bnxt: fix AGG ID computation Applying: net/bnxt: fix a null pointer dereference Applying: net/bnxt: handle UDP GSO Tx Applying: net/bnxt: add IPv6 flow label based RSS support Applying: net/bnxt: fix compressed CQE handling Applying: net/bnxt: fix compressed Rx CQE handling Applying: doc: update release notes for bnxt Using index info to reconstruct a base tree... M doc/guides/rel_notes/release_24_03.rst Falling back to patching base and 3-way merge... 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 0010 doc: update release notes for bnxt 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 (c5af8a22cc7a073efa45fbcd8448ba1ad8f386be) Applying patch... Failed to apply patch: Applying: net/bnxt: extend long bd check for VXLAN GPE Applying: net/bnxt: add dual rate module detection log Applying: net/bnxt: increase queue size for async handling Applying: net/bnxt: fix AGG ID computation Applying: net/bnxt: fix a null pointer dereference Applying: net/bnxt: handle UDP GSO Tx Applying: net/bnxt: add IPv6 flow label based RSS support Applying: net/bnxt: fix compressed CQE handling Applying: net/bnxt: fix compressed Rx CQE handling Applying: doc: update release notes for bnxt Using index info to reconstruct a base tree... M doc/guides/rel_notes/release_24_03.rst Falling back to patching base and 3-way merge... 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 0010 doc: update release notes for bnxt 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/29215/ UNH-IOL DPDK Community Lab