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 0AD3643AC5 for ; Thu, 8 Feb 2024 07:33:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 06EDC4029C; Thu, 8 Feb 2024 07:33:43 +0100 (CET) Received: from mail-ua1-f99.google.com (mail-ua1-f99.google.com [209.85.222.99]) by mails.dpdk.org (Postfix) with ESMTP id AE1C340295 for ; Thu, 8 Feb 2024 07:33:41 +0100 (CET) Received: by mail-ua1-f99.google.com with SMTP id a1e0cc1a2514c-7d2e19120b5so772032241.2 for ; Wed, 07 Feb 2024 22:33:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1707374021; x=1707978821; darn=dpdk.org; h=cc:to:from:subject:message-id:date:from:to:cc:subject:date :message-id:reply-to; bh=pIKfGwiJ7thVyMHTXq++ndjzfh/N0BFPKGuOvopBGv8=; b=MyoZ2wCl3sXfgmUfmPcRTCTvy7sLlrHC/ciWnUB2bbiwv3CIE2neUg/T8HuZS1y2Bq mO4SFGlY+G/mOGBcUp6Wu0pupuTzS8zj4+bCE2P+ywE6zqT65ZGJUifKwwx7hA9+fFnt z29kjZon2jpf38qavmIXZpduoNtrYtHey7ctI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707374021; x=1707978821; h=cc:to:from:subject:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pIKfGwiJ7thVyMHTXq++ndjzfh/N0BFPKGuOvopBGv8=; b=cLU7Ramc0xwmfsi04HKDDzRtVBI0inobK0MESpjclmGmtS56So+P4ot8BJySUta4lO 3ZdWf7MgKZz/4y6CWZG0s+I19TKdcJTanJw3akgL7MQzgtn1xUEx9s/HZOse0Rb3B+I9 M6yh1tMp6OrZwXoiyZb93JfkRTsg7nTR+ApwY9IRKQf24GpRSsuk4W9R1dxfEk85QRku DvPwirFJhHQKlJDIzeWBzkIZV28aW3PEaWJjy8rEBPTEPcQect5WFl3PtrbxghXndivP eYBEtLq+dRtBilqnPtMFxcbKdoackufDIIbhbxDzrUtPdGq/J1GZBPYjvdFeTYhV3d5j wj/A== X-Gm-Message-State: AOJu0Ywtvdkar3atccQebG6MAXUfX/z/0eFnBSvv0/fqnHg4r71Pn8HO BwCXAbIFz58gXaXonNhMOXCteHddvuedlrOUeCIdKo6ke5KnoaKsikbeoyXfaJAyhr8D2YEahQs RnwQhWh1l9R0gpm1dI2RTz5zTxm2I8fU9T3Sir5JRM/DpUNE5ixb6FlAg X-Google-Smtp-Source: AGHT+IEqc+AAlTmoBX8RASuSYLLMFYOWUkEQL7/96NZls22TtnIPNf/b3G54ShIIu5VHPGfaMKdzuD28SiDD X-Received: by 2002:a05:6102:32c4:b0:46d:2f47:d87f with SMTP id o4-20020a05610232c400b0046d2f47d87fmr5963538vss.28.1707374021187; Wed, 07 Feb 2024 22:33:41 -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 ed8-20020ad44ea8000000b0068693d76e97sm145224qvb.24.2024.02.07.22.33.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Feb 2024 22:33:41 -0800 (PST) X-Relaying-Domain: iol.unh.edu Date: Wed, 07 Feb 2024 22:33:41 -0800 (PST) Message-ID: <65c475c5.d40a0220.d6ab1.9891SMTPIN_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 E819E6052517; Thu, 8 Feb 2024 01:33:40 -0500 (EST) Subject: |WARNING| pw136513-136515 [PATCH] [3/3] net/bnxt: add IPv6 flow label based RSS support 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/136513 _apply patch failure_ Submitter: Ajit Khaparde Date: Thursday, February 08 2024 05:43:11 Applied on: CommitID:67d787e43c304dba6be55f0ce93df006d0997e48 Apply patch set 136513-136515 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 (a4ce111cc89f580b8c4aad51bdb061acbdfde86b) Done: main commit a4ce111cc89f580b8c4aad51bdb061acbdfde86b Trying to checkout branch: origin/next-net-for-main Checked out to next-net-for-main (67d787e43c304dba6be55f0ce93df006d0997e48) Applying patch... Failed to apply patch: Applying: ethdev: add support for RSS based on IPv6 flow label Applying: app/testpmd: add IPv6 flow label to RSS types Applying: net/bnxt: add IPv6 flow label based RSS support Using index info to reconstruct a base tree... M drivers/net/bnxt/bnxt.h M drivers/net/bnxt/bnxt_ethdev.c M drivers/net/bnxt/bnxt_hwrm.c M drivers/net/bnxt/bnxt_vnic.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/bnxt/bnxt_vnic.c CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt_vnic.c Auto-merging drivers/net/bnxt/bnxt_hwrm.c CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt_hwrm.c Auto-merging drivers/net/bnxt/bnxt_ethdev.c CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt_ethdev.c Auto-merging drivers/net/bnxt/bnxt.h CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0003 net/bnxt: add IPv6 flow label based RSS support 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 (67d787e43c304dba6be55f0ce93df006d0997e48) Applying patch... Failed to apply patch: Applying: ethdev: add support for RSS based on IPv6 flow label Applying: app/testpmd: add IPv6 flow label to RSS types Applying: net/bnxt: add IPv6 flow label based RSS support Using index info to reconstruct a base tree... M drivers/net/bnxt/bnxt.h M drivers/net/bnxt/bnxt_ethdev.c M drivers/net/bnxt/bnxt_hwrm.c M drivers/net/bnxt/bnxt_vnic.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/bnxt/bnxt_vnic.c CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt_vnic.c Auto-merging drivers/net/bnxt/bnxt_hwrm.c CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt_hwrm.c Auto-merging drivers/net/bnxt/bnxt_ethdev.c CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt_ethdev.c Auto-merging drivers/net/bnxt/bnxt.h CONFLICT (content): Merge conflict in drivers/net/bnxt/bnxt.h error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0003 net/bnxt: add IPv6 flow label based RSS support 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/29090/ UNH-IOL DPDK Community Lab