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 973B143D6D for ; Thu, 28 Mar 2024 17:40:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 909F7402E7; Thu, 28 Mar 2024 17:40:29 +0100 (CET) Received: from mail-io1-f100.google.com (mail-io1-f100.google.com [209.85.166.100]) by mails.dpdk.org (Postfix) with ESMTP id 0D597402D8 for ; Thu, 28 Mar 2024 17:40:08 +0100 (CET) Received: by mail-io1-f100.google.com with SMTP id ca18e2360f4ac-7c8060a8489so34027239f.0 for ; Thu, 28 Mar 2024 09:40:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1711644007; x=1712248807; 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=FYPNplfk6Yvm+XW3DmjTENsHgEXNzf4OuLlL8v2INLU=; b=HYS9muvuR/Gfw9T7PBHiDXiVUlK5fT3j+KP5UbVMabcqog4JJ4DEuZlij+Ql0azJvm zjHpHDWuhk3d53TZIUTdo+1Qko8xpHZ+aFYx6FjEzUH1VWf6/wkSsfqCtX2BnljhQGqW b1unLrgUi45bIFZKDzGP0BRUnE7vJurXGOLvM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711644007; x=1712248807; h=references:in-reply-to:cc:to:from:subject:message-id:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=FYPNplfk6Yvm+XW3DmjTENsHgEXNzf4OuLlL8v2INLU=; b=M4MFQ6MB48Vc9J88Sgvpslf9EHW5++/C596ocFqtv/csdaYeHI3k8NlHMprHSqyj3C 50zer57S7saXQUmBH+HXHyhxrjS3Gq5hNqJIyX7p0olXur0XXOIRqJOdpD64li6a42dh 79+oQjo5lTX729K8iiS+poh2/G7rC1+I4m9+Vxzn6cakjR/JcdCxRVdnLm0wHseD9Ovn Od9hdCmp3qBeINHoyUPhoxsBpzJ/9sezn9V5KWi1b/mbHpCivN9qBvCgb81K+QcY4u2b C66UxvFGwCijNQo+cU9McXRFjAM9V8w79rGi+y5EP5Cq5nRl4VyCx+87NC6djvk8c3mn T8cA== X-Gm-Message-State: AOJu0YzQHx+WZebepl2uqTy+LIgsb41A4jUS0OJ4nTftlFmu+F2QpHCC vFX/7JRloPEipej3vg6adPFjvFnRBpYzd7whlInwj6YLa8cKN3U9Ag28fiVSfnv1ONapSxf/0i4 HYMJ7LoFGe9+ymibhntRkT48bnJ68J+ekeN8fHx6r X-Google-Smtp-Source: AGHT+IHl2bMARRHIY/B9XNP5FhKqo5nlSUV+E3NjmHdQ4a/AHRXTcO62uQQAPT+qVeS9Wz04abL9uJgCVIn6 X-Received: by 2002:a5e:de0a:0:b0:7d0:96dc:581f with SMTP id e10-20020a5ede0a000000b007d096dc581fmr788802iok.4.1711644007446; Thu, 28 Mar 2024 09:40:07 -0700 (PDT) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id u13-20020a05660229ad00b007d0317ef743sm65113ios.32.2024.03.28.09.40.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2024 09:40:07 -0700 (PDT) X-Relaying-Domain: iol.unh.edu Date: Thu, 28 Mar 2024 09:40:07 -0700 (PDT) Message-ID: <66059d67.050a0220.9b85e.3bf5SMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.21.0.7] (unknown [172.18.0.240]) by postal.iol.unh.edu (Postfix) with ESMTP id E67316052471; Thu, 28 Mar 2024 12:40:06 -0400 (EDT) Subject: |WARNING| pw138959 [PATCH] maintainers: update for cpfl driver From: dpdklab@iol.unh.edu To: test-report@dpdk.org Cc: dpdk-test-reports@iol.unh.edu In-Reply-To: <20240328160638.1345980-1-yuying.zhang@intel.com> References: <20240328160638.1345980-1-yuying.zhang@intel.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/138959 _apply patch failure_ Submitter: Zhang, Yuying Date: Thursday, March 28 2024 16:06:38 Applied on: CommitID:a9778aad62470a38ccbb4e09a2a6bf0cc2e0e36d Apply patch set 138959 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 (a9778aad62470a38ccbb4e09a2a6bf0cc2e0e36d) Done: main commit a9778aad62470a38ccbb4e09a2a6bf0cc2e0e36d Trying to checkout branch: origin/main Checked out to main (a9778aad62470a38ccbb4e09a2a6bf0cc2e0e36d) Applying patch... Failed to apply patch: Applying: maintainers: update for cpfl driver Using index info to reconstruct a base tree... M MAINTAINERS Falling back to patching base and 3-way merge... Auto-merging MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 maintainers: update for cpfl driver 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/29677/ UNH-IOL DPDK Community Lab