Re: [dpdk-dev] [PATCH v4 2/2] drivers/raw: remove octeontx2-ep driver

[David Marchand <david.marchand@redhat.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