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 B220443AAF for ; Wed, 7 Feb 2024 23:52:52 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8A655402A9; Wed, 7 Feb 2024 23:52:52 +0100 (CET) Received: from mail-il1-f227.google.com (mail-il1-f227.google.com [209.85.166.227]) by mails.dpdk.org (Postfix) with ESMTP id 170404027D for ; Wed, 7 Feb 2024 23:52:51 +0100 (CET) Received: by mail-il1-f227.google.com with SMTP id e9e14a558f8ab-363ac28b375so3705785ab.3 for ; Wed, 07 Feb 2024 14:52:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1707346370; x=1707951170; darn=dpdk.org; h=cc:to:from:subject:message-id:date:from:to:cc:subject:date :message-id:reply-to; bh=l+lnjNRMTBdQmajedYsozFLZAjWyEBaRfHq7gYw/cr8=; b=dFrq8l7paZYSwDIg0CshSH4TkpLhqhSl7YoVS+Qib6ElKhV83sR0zDVOqaI1X0VFlm ts3+wX0ItHYU49EU78b65knFPB14ILgGyIOx5z6hz8SOWkJjHQrc54em8ZKUCOnqSAxi URvPVKCsNQ9MYVmsFXWIgZ/crUz5rJsbaCQFI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707346370; x=1707951170; h=cc:to:from:subject:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l+lnjNRMTBdQmajedYsozFLZAjWyEBaRfHq7gYw/cr8=; b=g5Qj8d5NhNeluy+j6tdUqWSf34Ga9y2P36JqzxP5vwNCJwocMyOsUOe8nu3nwkZ5jM 6o0X9emYGAC7+4MQJrSMaI6Gj/LIP+jWzo+4aJav8yoB3a3tx9t/uKU6mUOtu7TRy5Gj EjIIfSPcq4dR/rMRaTxRH13M0tMD/7O/s++66Zpp68zVmHRrdGxvCDILIsU2aCPcXuuB vRpkcJX3K64fw/M+vZraBd2t2F9HVybqyvhElC2dXi+b/vwUtdshzORbEBxy/mYitHRL 0YppWOJG9B3AzpMnDPw9414zMP7yVN1/lv0TdhcnSAWBTQqBIxdc+C42peAmHJzQzlOh U5ig== X-Gm-Message-State: AOJu0YykEUHRPd9TSD7ugDTq0TTpaJuSxHlSxIx83ExiGHO+DYegZwcK dJI6zJ8uAjdktvaJYamMITtTjlJwU4ot2cX2B1idRmFkuBdWoQAnkF8FTlVIVONf9DLPK8jmXcX nFJi+W1gOlCZWOTj1YEnlXNUWZYbusKVniBfRxOL7 X-Google-Smtp-Source: AGHT+IED5m4c+1Tb2XDAJ9ehdG/cisxd1P5THhmIHjONW7jcckZ9ZHbQfN2HbJqHAdQkq5AJQuYWFH2jXFeN X-Received: by 2002:a05:6e02:4a7:b0:363:8f8b:44cc with SMTP id e7-20020a056e0204a700b003638f8b44ccmr7337133ils.24.1707346370189; Wed, 07 Feb 2024 14:52:50 -0800 (PST) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id w2-20020a636202000000b005cfb6e7d92csm86132pgb.34.2024.02.07.14.52.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Feb 2024 14:52:50 -0800 (PST) X-Relaying-Domain: iol.unh.edu Date: Wed, 07 Feb 2024 14:52:50 -0800 (PST) Message-ID: <65c409c2.630a0220.cae69.55ffSMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.17.0.3] (unknown [172.18.0.217]) by postal.iol.unh.edu (Postfix) with ESMTP id 5F1C36052516; Wed, 7 Feb 2024 17:52:49 -0500 (EST) Subject: |WARNING| pw136499-136504 [PATCH] [v6, 6/6] baseband/fpga_5gnr_fec: cosmetic comment changes 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/136499 _apply patch failure_ Submitter: Hernan Vargas Date: Wednesday, February 07 2024 17:13:50 Applied on: CommitID:263729efd1eb998ba1d7829971ecee620c79d0ce Apply patch set 136499-136504 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-baseband-for-main Checked out to next-baseband-for-main (263729efd1eb998ba1d7829971ecee620c79d0ce) Applying patch... Failed to apply patch: Applying: doc: fix fpga 5gnr configuration values Applying: baseband/fpga_5gnr_fec: renaming for consistency Using index info to reconstruct a base tree... M drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c Falling back to patching base and 3-way merge... Auto-merging drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c CONFLICT (content): Merge conflict in drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0002 baseband/fpga_5gnr_fec: renaming for consistency 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 (263729efd1eb998ba1d7829971ecee620c79d0ce) Applying patch... Failed to apply patch: Applying: doc: fix fpga 5gnr configuration values Applying: baseband/fpga_5gnr_fec: renaming for consistency Using index info to reconstruct a base tree... M drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c Falling back to patching base and 3-way merge... Auto-merging drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c CONFLICT (content): Merge conflict in drivers/baseband/fpga_5gnr_fec/rte_fpga_5gnr_fec.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0002 baseband/fpga_5gnr_fec: renaming for consistency 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/29087/ UNH-IOL DPDK Community Lab