From: Patchwork <patchwork@emeril.freedesktop.org>
To: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Cc: igt-dev@lists.freedesktop.org
Subject: [igt-dev] ✗ Fi.CI.BUILD: failure for igt tests for hot-unplug feature in amdgpu
Date: Thu, 03 Jun 2021 15:51:07 -0000 [thread overview]
Message-ID: <162273546781.8034.15552862121725611987@emeril.freedesktop.org> (raw)
In-Reply-To: <20210603150800.157685-1-andrey.grodzovsky@amd.com>
== Series Details ==
Series: igt tests for hot-unplug feature in amdgpu
URL : https://patchwork.freedesktop.org/series/90949/
State : failure
== Summary ==
Applying: tests/core_hotunplug: Add command submission for amdgpu
Using index info to reconstruct a base tree...
A tests/Makefile.am
M tests/core_hotunplug.c
M tests/meson.build
Falling back to patching base and 3-way merge...
Auto-merging tests/meson.build
Auto-merging tests/core_hotunplug.c
CONFLICT (modify/delete): tests/Makefile.am deleted in HEAD and modified in tests/core_hotunplug: Add command submission for amdgpu. Version tests/core_hotunplug: Add command submission for amdgpu of tests/Makefile.am left in tree.
Patch failed at 0001 tests/core_hotunplug: Add command submission for amdgpu
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".
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
prev parent reply other threads:[~2021-06-03 15:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-03 15:07 [igt-dev] [PATCH 0/3] igt tests for hot-unplug feature in amdgpu Andrey Grodzovsky
2021-06-03 15:07 ` [igt-dev] [PATCH 1/3] tests/core_hotunplug: Add command submission for amdgpu Andrey Grodzovsky
2021-06-03 15:07 ` [igt-dev] [PATCH 2/3] tests/core_hotunplug: Add hotunplug with exported dma-buf test Andrey Grodzovsky
2021-06-03 15:08 ` [igt-dev] [PATCH 3/3] tests/core_hotunplug: Add hotunplug with exported sync obj test Andrey Grodzovsky
2021-06-03 15:51 ` Patchwork [this message]
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=162273546781.8034.15552862121725611987@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=andrey.grodzovsky@amd.com \
--cc=igt-dev@lists.freedesktop.org \
/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.