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 668F5A0C58; Mon, 23 Aug 2021 14:32:12 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DCC844014D; Mon, 23 Aug 2021 14:32:11 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mails.dpdk.org (Postfix) with ESMTP id 0F4D240042 for ; Mon, 23 Aug 2021 14:32:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629721929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=y64mFJgS8o0F4e8JjsJ7+DQdenN8qYzMFQT4iPpR+QA=; b=f5s250wEkQNcqatg85eqMhxl4Sukag6qyCoCDVM8J5yWdT9MJmDYv9YNlQ9msgOotDMo6j Q2tG/mDQ5nKraKoB+VIGGegjFT2fUqIp8YDX/hg7KnrLeAYFFj7axrXycnF7IH2e0l3JIk GShlvonghzXR9LDfBKZcuNfbcQ4sUGs= Received: from mail-vs1-f69.google.com (mail-vs1-f69.google.com [209.85.217.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-99-mdmv8B-mNo-fsmOHTCAoug-1; Mon, 23 Aug 2021 08:32:06 -0400 X-MC-Unique: mdmv8B-mNo-fsmOHTCAoug-1 Received: by mail-vs1-f69.google.com with SMTP id b4-20020a67d384000000b002c312ee0bdeso2790690vsj.11 for ; Mon, 23 Aug 2021 05:32:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=y64mFJgS8o0F4e8JjsJ7+DQdenN8qYzMFQT4iPpR+QA=; b=D14WmtAa5fll1C3/o3N3Z0meAsGdinTLD5s7IVFx3JzIrBolk5vLIBT/McznSlOhBT wKAckgNvEazJtj4RJb2Q//Q2e4yBz1v9bCnMD/M7DG5mB0A+/b5+5F3nWCua9lr1Ipwt 7zyHMxgkpISjcfnmIY8XlUc0sGglLstf2eY4O/6ryBK0H71t8yntPTxpnAj3sL/veJ9h zP4lZH9jX5j43aFHYdRGIrREWS/ZgFjKqzRjONsVI5alVOvv1ci0Jjg7GtKPr3C/7KOC Z7Zz8C5sp+P9O4hT3qTuEvd2gf8SxqBPXae55/IukzeS0wSWSf6Jcr9tVHXrYfydJHoG 9VGQ== X-Gm-Message-State: AOAM5337MwK0vOZU8Fod3RES8NFhhPaysPL6tc07UxJaK5ANLHx5CJY2 j/qgJr6ZezicWve7r6O0UhTjel5+AjbK7mrZVywtcMWJ2RgOYd9IFfw7HVBaOxHwdKedZJQw9If /E/CXUo9x/TpvUwF3SD0= X-Received: by 2002:a05:6102:2004:: with SMTP id p4mr334435vsr.5.1629721925660; Mon, 23 Aug 2021 05:32:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwJkWABlIQGEyrzmuKEw1SxKy+USoFGBmoTU9FriypRJ/k7d1OaGP4qSTold48/bSKxKaeBKOgo/Ae1Gd3LKVs= X-Received: by 2002:a05:6102:2004:: with SMTP id p4mr334410vsr.5.1629721925411; Mon, 23 Aug 2021 05:32:05 -0700 (PDT) MIME-Version: 1.0 References: <20210813070104.176246-1-radhac@marvell.com> <20210819075920.103301-1-radhac@marvell.com> In-Reply-To: From: David Marchand Date: Mon, 23 Aug 2021 14:31:54 +0200 Message-ID: To: Radha Mohan Cc: Radha Mohan Chintakuntla , Veerasenareddy Burru , Thomas Monjalon , dpdk-dev , Satananda Burla , Jerin Jacob Kollanukkaran Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dmarchan@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-dev] [PATCH v4 2/2] drivers/raw: remove octeontx2-ep driver X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Mon, Aug 23, 2021 at 2:19 PM Radha Mohan wrote: > I received this report that this patch failed to apply > http://mails.dpdk.org/archives/test-report/2021-August/211611.html The two patches of this series are seen as two separate series. http://patchwork.dpdk.org/project/dpdk/list/?submitter=2007 I don't have the reason why, but this is likely because of the way those patches were submitted to the ml. Please double check. For the details on the conflict: the CI tries to test each series, so here, the second patch is tested without the first patch applied, and it fails. You can reproduce with: $ git reset --hard origin/main $ git describe v21.08-1-gfdab8f2e17 $ git pw series apply 18350 Applying: drivers/raw: remove octeontx2-ep driver Using index info to reconstruct a base tree... M MAINTAINERS M doc/guides/rawdevs/index.rst M drivers/raw/meson.build Falling back to patching base and 3-way merge... Removing drivers/raw/octeontx2_ep/version.map Removing drivers/raw/octeontx2_ep/otx2_ep_vf.h Removing drivers/raw/octeontx2_ep/otx2_ep_vf.c Removing drivers/raw/octeontx2_ep/otx2_ep_test.c Removing drivers/raw/octeontx2_ep/otx2_ep_rawdev.h Removing drivers/raw/octeontx2_ep/otx2_ep_rawdev.c Removing drivers/raw/octeontx2_ep/otx2_ep_enqdeq.h Removing drivers/raw/octeontx2_ep/otx2_ep_enqdeq.c Removing drivers/raw/octeontx2_ep/meson.build Auto-merging drivers/raw/meson.build CONFLICT (content): Merge conflict in drivers/raw/meson.build Removing doc/guides/rawdevs/octeontx2_ep.rst Auto-merging doc/guides/rawdevs/index.rst CONFLICT (content): Merge conflict in doc/guides/rawdevs/index.rst 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 drivers/raw: remove octeontx2-ep 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". -- David Marchand