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 8DBCFA0C58; Mon, 23 Aug 2021 14:41:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 740B04118B; Mon, 23 Aug 2021 14:41:43 +0200 (CEST) Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by mails.dpdk.org (Postfix) with ESMTP id 5CB664014E for ; Mon, 23 Aug 2021 14:41:42 +0200 (CEST) Received: by mail-lf1-f42.google.com with SMTP id v19so12389396lfo.7 for ; Mon, 23 Aug 2021 05:41:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=nKrPWyEFp1I4v8v8FSZcETRaHsTUW/Et4ddBx9lS7ZQ=; b=TLMETcu1/OVn23YL4I4STHvZovlQq+Iq0hCVqDueEkMOMvWOvFfs8soog+kP+ETD1P RT3wM4rc4gdazHwqT5t3oFDqUZMCbhCl1wJqE6Hv54+YaOpImXqgTqZXJ2i0xFQNBk3J v/PU3UUG8QH0cLin0hiMT8Ss1wrHH3FGzumy8EyGsrXQX9ensiFHSv12Fq2GrqIt0PGo fPNK2LIfeNds1HIT8ZTjZo1LEbZGaKneV0xOjRSFv5CCodw/TCuMfLev4/vWEQvOqkbu hUHJ3WAk6D8T1t2yQtdcZ2ssVcWCjB+5EPDB0GxUfvkggaSEwd78Mr/XJ1FNhHCPh2PK OFxA== 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=nKrPWyEFp1I4v8v8FSZcETRaHsTUW/Et4ddBx9lS7ZQ=; b=lLlZuixjMr/T0JV/Kwg0/w+ULfDWBq2zf5gqbuORC5j45OIF4xj/vhnyeisgFQuB4q J2WC5cziFXVS/YfOASRFygsXPzODCuG2QpRGszQttt1+g8w8g+Yxe5ZAD2UBQHLuDm2x zNOzTULOF8tHiuh8jnBgHgSUFpRFq+IAwuvslMuTKZVGKfDSjXNP+oMe+c7GlbEPOsQ4 /UR+Y1hk5RKr712mXubdKgAnEJN5AQmb4bFvmMoG/2HXz8iB5pZYZV+K2rw5NzODrusA kvtIQM3BbrSwuIDzPRl8qvHeUNRVNMaUBSUNi2rCPRCURwmP/yYseMIXed7eHfUQciBw DGqw== X-Gm-Message-State: AOAM531m90eJVFHWtUGESakuoIGzAjXUlWh341Z6kfxVxSov58cwEvgC 9sUFjLH1pV5xBoKByNbhtAOKV2q8tXOncL7u2So= X-Google-Smtp-Source: ABdhPJxva+GK1JA+37cXylNaxO5c+zfaOJZXyeYv6oWz6gf9/gbVMt5uQnkRIOvXZGgNagfiXdP4pgFjhAkKo8waL80= X-Received: by 2002:a05:6512:60d:: with SMTP id b13mr25109402lfe.135.1629722501879; Mon, 23 Aug 2021 05:41:41 -0700 (PDT) MIME-Version: 1.0 References: <20210813070104.176246-1-radhac@marvell.com> <20210819075920.103301-1-radhac@marvell.com> In-Reply-To: From: Radha Mohan Date: Mon, 23 Aug 2021 18:11:30 +0530 Message-ID: To: David Marchand Cc: Radha Mohan Chintakuntla , Veerasenareddy Burru , Thomas Monjalon , dpdk-dev , Satananda Burla , Jerin Jacob Kollanukkaran 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 6:02 PM David Marchand wrote: > > 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. > ok let me check and re-submit. thank you. > > 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 >