From: David Marchand <david.marchand@redhat.com>
To: Radha Mohan <mohun106@gmail.com>
Cc: Radha Mohan Chintakuntla <radhac@marvell.com>,
Veerasenareddy Burru <vburru@marvell.com>,
Thomas Monjalon <thomas@monjalon.net>, dpdk-dev <dev@dpdk.org>,
Satananda Burla <sburla@marvell.com>,
Jerin Jacob Kollanukkaran <jerinj@marvell.com>
Subject: Re: [dpdk-dev] [PATCH v4 2/2] drivers/raw: remove octeontx2-ep driver
Date: Mon, 23 Aug 2021 14:31:54 +0200 [thread overview]
Message-ID: <CAJFAV8x4GHjjaVQoM1mTuqUrJpQw1mmp_WEjEKYDv0agSG+6vg@mail.gmail.com> (raw)
In-Reply-To: <CAC8NTUXHdszN8LVm6NkYfb+EPQRi0_8pMqnG61yfB610D_PzWQ@mail.gmail.com>
On Mon, Aug 23, 2021 at 2:19 PM Radha Mohan <mohun106@gmail.com> 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
next prev parent reply other threads:[~2021-08-23 12:32 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-12 12:37 [dpdk-dev] [PATCH v2 1/2] drivers/raw: remove octeontx2-dma driver Radha Mohan Chintakuntla
2021-08-13 7:00 ` [dpdk-dev] [PATCH v3 " Radha Mohan Chintakuntla
2021-08-19 7:57 ` [dpdk-dev] [PATCH v4 " Radha Mohan Chintakuntla
2021-08-20 3:38 ` Radha Mohan
2021-08-23 15:21 ` [dpdk-dev] [PATCH RESEND " Radha Mohan Chintakuntla
2021-08-23 15:21 ` [dpdk-dev] [PATCH RESEND v4 2/2] drivers/raw: remove octeontx2-ep driver Radha Mohan Chintakuntla
2021-08-23 16:27 ` Radha Mohan
2021-08-25 7:20 ` Thomas Monjalon
2021-08-26 10:50 ` [dpdk-dev] [PATCH v5 1/2] drivers/raw: remove octeontx2-dma driver Radha Mohan Chintakuntla
2021-08-26 10:50 ` [dpdk-dev] [PATCH v5 2/2] drivers/raw: remove octeontx2-ep driver Radha Mohan Chintakuntla
2021-08-26 11:10 ` Radha Mohan
2021-10-18 16:36 ` [dpdk-dev] [PATCH v5 1/2] drivers/raw: remove octeontx2-dma driver Thomas Monjalon
2021-08-13 7:01 ` [dpdk-dev] [PATCH v3 2/2] drivers/raw: remove octeontx2-ep driver Radha Mohan Chintakuntla
2021-08-19 7:59 ` [dpdk-dev] [PATCH v4 " Radha Mohan Chintakuntla
2021-08-23 12:19 ` Radha Mohan
2021-08-23 12:31 ` David Marchand [this message]
2021-08-23 12:41 ` Radha Mohan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAJFAV8x4GHjjaVQoM1mTuqUrJpQw1mmp_WEjEKYDv0agSG+6vg@mail.gmail.com \
--to=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=jerinj@marvell.com \
--cc=mohun106@gmail.com \
--cc=radhac@marvell.com \
--cc=sburla@marvell.com \
--cc=thomas@monjalon.net \
--cc=vburru@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.