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 A69F948AF0 for ; Wed, 12 Nov 2025 19:02:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9F53D40662; Wed, 12 Nov 2025 19:02:39 +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 99FDC40662 for ; Wed, 12 Nov 2025 19:02:37 +0100 (CET) Received: by mail-yw1-f228.google.com with SMTP id 00721157ae682-780fe76f457so11145167b3.0 for ; Wed, 12 Nov 2025 10:02:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1762970557; x=1763575357; 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=CuAJa43WOtxEu00TvBK2QYZRz5xl7L/2O08pBglYUSg=; b=e67SYOQZvgI+qiq+TQxqwa3VTG4pt8mBeGXac2bFqq5ih954rBTTQoJ1/hZ47q3REL mS/KZQu1h7F/bo5S23FfjYoy4gpKHu9v9j+4U/e2jBPvKIOqk2SIJAIfMJ25WtXX/8EL cw29tuHjTYHHZ1UgmeYeuDmV9EX2MJAs3vWwQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762970557; x=1763575357; h=references:in-reply-to:cc:to:from:subject:message-id:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CuAJa43WOtxEu00TvBK2QYZRz5xl7L/2O08pBglYUSg=; b=daOxq2xfu7xYzrhpo6Fkmif5oDTBLlDEVgt9uPj+VQbS/kBOTeUbdQENNVWbG87xqa +Y81JjKadYercWUMNMUNpEjdx5xxtNLiEFaEAGGy/LDqd3NZB3nUP+FT5Kni62fF5lfp Jt3rmtZ/dPW5Mw3gtjZxReOdw/O5DooQrGV5jJ23jnUKURpiFfhuDtYSxxRthEHXajv8 R4t0eiSqkcdoDKYx01YuPbZhPD72WYKY1nxqE+R+eYw5+JcrsB9Hk7tv/+3F2Wa+RaR1 MV5nMKEe5drLnXYOD8jYsQCEeA7HKMuOxoGFpv7bUtMEWyF3j2JpLVfj4Gqt2mkIc+z+ zgXQ== X-Gm-Message-State: AOJu0Yz4W8S/kla+6wFwCIr8KHyXvpijc8pPxk1T0E0MdFIWirr6fO6N ql+8FoC7WQ2AJTfL1zaauuPyQl22dc/JXUnfMO5CsARgQ1kdzFvcS9qWIZHtTMrZUZ/2bQHFEMT bbI87DcGcC7lFq6K7oHq5o8l9Rp+P5wlphJENqzsHCkW0oiIRzDwkch5/eiFW X-Gm-Gg: ASbGncvI+oXlBomE0n0+V/kEfZya9PcZl3P+LdV8nqxEkErBkiCfjHJvi/+mQs6m0Yo HzgPmGbE+u49l4zJxBURUDRjqsFJrxx5M3m0t2RgpN7/Xtm1E+F3CoaOmTNeGJ8piKDxpjx28Hn 7NnoI+/1z7XMF9os4JHuvEedHVA1u24MQ7cp7ckzF8Ncss2V5LLgA0rYGvXao+FaAe1x3dirUAB Y8/AtB8/E13GdCi79EyCIbkWc7rrqvt3swxjrBelq+i25hljD2Ks3oq21wjLJyBV0f/S11NxR1h 8woBB61XlEggpMc+Z2UdwUPjmX+U7fcjShKpR4hnmrb3g0OONePVsr1feeWA10UF9+BLZ0o41i2 jCJMPOf4G X-Google-Smtp-Source: AGHT+IFgyJ41METm6HrjGMkKT+7zGKooWgwd6uDFbnexbVMOaDsVK1+nqPiujSxJh2hE26ulSfUrxYuu2jSm X-Received: by 2002:a05:690c:4a11:b0:786:69ee:15f2 with SMTP id 00721157ae682-788135dd43emr60310757b3.3.1762970556735; Wed, 12 Nov 2025 10:02:36 -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 00721157ae682-787d65f78a8sm7237307b3.9.2025.11.12.10.02.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Nov 2025 10:02:36 -0800 (PST) X-Relaying-Domain: iol.unh.edu Date: Wed, 12 Nov 2025 10:02:36 -0800 (PST) Message-ID: <6914cbbc.050a0220.40dcd.6726SMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.21.0.4] (unknown [172.18.0.240]) by postal.iol.unh.edu (Postfix) with ESMTP id 52B66604D420; Wed, 12 Nov 2025 13:02:36 -0500 (EST) Subject: |WARNING| pw158544-158545 [PATCH] [v1, 4/4] net/nbl: update documentation and maintainers From: dpdklab@iol.unh.edu To: test-report@dpdk.org Cc: dpdk-test-reports@iol.unh.edu In-Reply-To: <20251107073459.3532524-5-dimon.zhao@nebula-matrix.com> References: <20251107073459.3532524-5-dimon.zhao@nebula-matrix.com> 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/158545 _apply patch failure_ Submitter: Dimon Zhao Date: Friday, November 07 2025 07:34:59 Applied on: CommitID:be0112878b4fc3a1b918370ed2fe615c52039d77 Apply patch set 158544-158545 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 (be0112878b4fc3a1b918370ed2fe615c52039d77) Done: main commit be0112878b4fc3a1b918370ed2fe615c52039d77 Trying to checkout branch: origin/next-net-for-main Checked out to next-net-for-main (29807269854f9bfc72f1323273de8e23adc724d4) Applying patch... Failed to apply patch: Applying: net/nbl: change default Rx extension header size to 12 bytes Using index info to reconstruct a base tree... M drivers/net/nbl/nbl_dev/nbl_dev.c M drivers/net/nbl/nbl_dev/nbl_dev.h M drivers/net/nbl/nbl_hw/nbl_resource.h M drivers/net/nbl/nbl_hw/nbl_txrx.c M drivers/net/nbl/nbl_include/nbl_include.h Falling back to patching base and 3-way merge... Auto-merging drivers/net/nbl/nbl_include/nbl_include.h Auto-merging drivers/net/nbl/nbl_hw/nbl_txrx.c CONFLICT (content): Merge conflict in drivers/net/nbl/nbl_hw/nbl_txrx.c Auto-merging drivers/net/nbl/nbl_hw/nbl_resource.h Auto-merging drivers/net/nbl/nbl_dev/nbl_dev.h Auto-merging drivers/net/nbl/nbl_dev/nbl_dev.c CONFLICT (content): Merge conflict in drivers/net/nbl/nbl_dev/nbl_dev.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 net/nbl: change default Rx extension header size to 12 bytes 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: origin/main Checked out to main (be0112878b4fc3a1b918370ed2fe615c52039d77) Applying patch... Failed to apply patch: Applying: net/nbl: change default Rx extension header size to 12 bytes Using index info to reconstruct a base tree... M drivers/net/nbl/nbl_dev/nbl_dev.c M drivers/net/nbl/nbl_dev/nbl_dev.h M drivers/net/nbl/nbl_hw/nbl_resource.h M drivers/net/nbl/nbl_hw/nbl_txrx.c M drivers/net/nbl/nbl_include/nbl_include.h Falling back to patching base and 3-way merge... Auto-merging drivers/net/nbl/nbl_include/nbl_include.h Auto-merging drivers/net/nbl/nbl_hw/nbl_txrx.c CONFLICT (content): Merge conflict in drivers/net/nbl/nbl_hw/nbl_txrx.c Auto-merging drivers/net/nbl/nbl_hw/nbl_resource.h Auto-merging drivers/net/nbl/nbl_dev/nbl_dev.h Auto-merging drivers/net/nbl/nbl_dev/nbl_dev.c CONFLICT (content): Merge conflict in drivers/net/nbl/nbl_dev/nbl_dev.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 net/nbl: change default Rx extension header size to 12 bytes 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/34556/ UNH-IOL DPDK Community Lab