public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Patchwork <patchwork@emeril.freedesktop.org>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] ✗ Fi.CI.BAT: failure for Modify tests for unavailable mappable aperture (rev6)
Date: Mon, 25 Feb 2019 18:37:03 -0000	[thread overview]
Message-ID: <20190225183703.9973.5013@emeril.freedesktop.org> (raw)
In-Reply-To: <20190221192745.31178-1-antonio.argenziano@intel.com>

== Series Details ==

Series: Modify tests for unavailable mappable aperture (rev6)
URL   : https://patchwork.freedesktop.org/series/57042/
State : failure

== Summary ==

Applying: tests/prime_self_import: Swap gtt mapping for cpu
Using index info to reconstruct a base tree...
M	tests/prime_self_import.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: tests/i915/gem_mmap_wc: Add local MMAP wrapper
Applying: igt/lib: Add wrapper to check if gtt mapping is available
Using index info to reconstruct a base tree...
M	lib/ioctl_wrappers.c
M	lib/ioctl_wrappers.h
Falling back to patching base and 3-way merge...
Auto-merging lib/ioctl_wrappers.h
Auto-merging lib/ioctl_wrappers.c
CONFLICT (content): Merge conflict in lib/ioctl_wrappers.c
Patch failed at 0003 igt/lib: Add wrapper to check if gtt mapping is available
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

      parent reply	other threads:[~2019-02-25 18:37 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-21 19:27 [igt-dev] [RFC 0/5] Modify tests for unavailable mappable aperture Antonio Argenziano
2019-02-21 19:27 ` [igt-dev] [RFC 1/5] tests/prime_self_import: Swap gtt mapping for cpu Antonio Argenziano
2019-02-21 19:46   ` Chris Wilson
2019-02-21 21:51     ` Antonio Argenziano
2019-02-21 22:08       ` Chris Wilson
2019-02-21 22:38   ` [igt-dev] [PATCH i-g-t] " Antonio Argenziano
2019-02-21 23:37     ` Chris Wilson
2019-02-22 16:50       ` Antonio Argenziano
2019-02-22 16:55         ` Chris Wilson
2019-02-22 17:19           ` Antonio Argenziano
2019-02-21 19:27 ` [igt-dev] [RFC 2/5] lib/ioctl_wrappers: add mmap_offset support Antonio Argenziano
2019-02-21 19:47   ` Chris Wilson
2019-02-21 21:13     ` Antonio Argenziano
2019-02-21 21:19       ` Chris Wilson
2019-02-22 21:59   ` [igt-dev] [PATCH i-g-t] lib/i915: " Antonio Argenziano
2019-02-22 22:01     ` Antonio Argenziano
2019-02-22 22:13       ` Chris Wilson
2019-02-22 22:29         ` Chris Wilson
2019-02-22 22:44           ` Antonio Argenziano
2019-02-25 18:28   ` [igt-dev] [PATCH i-g-t v3 1/2] " Antonio Argenziano
2019-02-25 18:28     ` [igt-dev] [PATCH i-g-t v3 2/2] tests/i915/gem_mmap_wc: Add local MMAP wrapper Antonio Argenziano
2019-02-25 22:24       ` Chris Wilson
2019-02-25 22:33         ` Antonio Argenziano
2019-02-25 22:46     ` [igt-dev] [PATCH i-g-t v3 1/2] lib/i915: add mmap_offset support Chris Wilson
2019-02-21 19:27 ` [igt-dev] [RFC 3/5] igt/lib: Add wrapper to check if gtt mapping is available Antonio Argenziano
2019-02-21 19:49   ` Chris Wilson
2019-02-21 21:37     ` Antonio Argenziano
2019-02-21 21:54       ` Chris Wilson
2019-02-22 22:20   ` [igt-dev] [PATCH i-g-t v2] " Antonio Argenziano
2019-02-21 19:27 ` [igt-dev] [RFC 4/5] igt/i915: Require GTT mapping to be available when needed Antonio Argenziano
2019-02-21 19:57   ` Chris Wilson
2019-02-23  0:01     ` Antonio Argenziano
2019-02-23  0:17       ` Chris Wilson
2019-04-09  0:12   ` Vanshidhar Konda
2019-02-21 19:27 ` [igt-dev] [RFC 5/5] igt/lib: If mappable aperture is missing return 0 size Antonio Argenziano
2019-02-21 20:01   ` Chris Wilson
2019-02-21 21:45     ` Antonio Argenziano
2019-02-21 21:51       ` Chris Wilson
2019-03-07 15:51         ` Antonio Argenziano
2019-03-07 15:58           ` Chris Wilson
2019-03-07 16:29             ` Antonio Argenziano
2019-03-07 16:45               ` Chris Wilson
2019-03-07 16:50                 ` Chris Wilson
2019-03-07 17:03                   ` Antonio Argenziano
2019-02-21 20:25 ` [igt-dev] ✓ Fi.CI.BAT: success for Modify tests for unavailable mappable aperture Patchwork
2019-02-21 23:24 ` [igt-dev] ✓ Fi.CI.BAT: success for Modify tests for unavailable mappable aperture (rev2) Patchwork
2019-02-22  8:04 ` [igt-dev] ✓ Fi.CI.IGT: success for Modify tests for unavailable mappable aperture Patchwork
2019-02-22 12:26 ` [igt-dev] ✓ Fi.CI.IGT: success for Modify tests for unavailable mappable aperture (rev2) Patchwork
2019-02-22 22:10 ` [igt-dev] ✗ Fi.CI.BAT: failure for Modify tests for unavailable mappable aperture (rev3) Patchwork
2019-02-22 22:30 ` [igt-dev] ✗ Fi.CI.BAT: failure for Modify tests for unavailable mappable aperture (rev4) Patchwork
2019-02-25 18:37 ` 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=20190225183703.9973.5013@emeril.freedesktop.org \
    --to=patchwork@emeril.freedesktop.org \
    --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