From: Patchwork <patchwork@emeril.freedesktop.org>
To: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: igt-dev@lists.freedesktop.org
Subject: [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/7] lib/rendercopy: Copy gen8 surface state definition to gen-9 header (rev4)
Date: Tue, 12 Mar 2019 10:13:50 -0000 [thread overview]
Message-ID: <20190312101350.22352.57421@emeril.freedesktop.org> (raw)
In-Reply-To: <20190305014742.3598-1-dhinakaran.pandiyan@intel.com>
== Series Details ==
Series: series starting with [i-g-t,1/7] lib/rendercopy: Copy gen8 surface state definition to gen-9 header (rev4)
URL : https://patchwork.freedesktop.org/series/57553/
State : failure
== Summary ==
Applying: lib/rendercopy: Copy gen8 surface state definition to gen-9 header
Using index info to reconstruct a base tree...
M lib/gen8_render.h
M lib/gen9_render.h
M lib/rendercopy_gen9.c
Falling back to patching base and 3-way merge...
Auto-merging lib/rendercopy_gen9.c
Auto-merging lib/gen9_render.h
CONFLICT (content): Merge conflict in lib/gen9_render.h
Patch failed at 0001 lib/rendercopy: Copy gen8 surface state definition to gen-9 header
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:[~2019-03-12 10:13 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-05 1:47 [igt-dev] [PATCH i-g-t 1/7] lib/rendercopy: Copy gen8 surface state definition to gen-9 header Dhinakaran Pandiyan
2019-03-05 1:47 ` [igt-dev] [PATCH i-g-t 2/7] lib/rendercopy: Add support for Yf/Ys tiling to gen9 rendercopy Dhinakaran Pandiyan
2019-03-05 10:14 ` Katarzyna Dec
2019-03-07 1:39 ` Pandiyan, Dhinakaran
2019-03-05 1:47 ` [igt-dev] [PATCH i-g-t 3/7] tests/gem_render_copy: Test Yf tiling Dhinakaran Pandiyan
2019-03-05 14:26 ` Katarzyna Dec
2019-03-07 0:58 ` Dhinakaran Pandiyan
2019-03-08 9:59 ` Katarzyna Dec
2019-03-07 1:33 ` [igt-dev] [PATCH i-g-t v2 " Dhinakaran Pandiyan
2019-03-09 3:36 ` [igt-dev] [PATCH i-g-t v3 " Dhinakaran Pandiyan
2019-03-05 1:47 ` [igt-dev] [PATCH i-g-t 4/7] lib/igt_fb: Use rendercopy for rendering into compressed buffers Dhinakaran Pandiyan
2019-03-06 22:42 ` Clinton Taylor
2019-03-05 1:47 ` [igt-dev] [PATCH i-g-t 5/7] lib/igt_fb: s/tiling/modifier/ where appropriate Dhinakaran Pandiyan
2019-03-05 1:47 ` [igt-dev] [PATCH i-g-t 6/7] lib/igt_fb: Function to create a bo for passed in igt_fb Dhinakaran Pandiyan
2019-03-05 1:47 ` [igt-dev] [PATCH i-g-t 7/7] tests/kms_ccs: Generate compressed surfaces with rendercopy Dhinakaran Pandiyan
2019-03-05 2:47 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/7] lib/rendercopy: Copy gen8 surface state definition to gen-9 header Patchwork
2019-03-05 8:43 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2019-03-05 10:12 ` [igt-dev] [PATCH i-g-t 1/7] " Katarzyna Dec
2019-03-07 2:07 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/7] lib/rendercopy: Copy gen8 surface state definition to gen-9 header (rev2) Patchwork
2019-03-07 3:03 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2019-03-09 4:18 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/7] lib/rendercopy: Copy gen8 surface state definition to gen-9 header (rev3) Patchwork
2019-03-09 9:25 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2019-03-12 10:13 ` 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=20190312101350.22352.57421@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=dhinakaran.pandiyan@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox