<html>
<head>
<base href="https://bugs.freedesktop.org/">
</head>
<body>
<p>
<div>
<b><a class="bz_bug_link
bz_status_NEW "
title="NEW - [BAT] [BDW SKL BXT KBL] igt@drv_hangman@error-state-basic timeouts"
href="https://bugs.freedesktop.org/show_bug.cgi?id=100196#c1">Comment # 1</a>
on <a class="bz_bug_link
bz_status_NEW "
title="NEW - [BAT] [BDW SKL BXT KBL] igt@drv_hangman@error-state-basic timeouts"
href="https://bugs.freedesktop.org/show_bug.cgi?id=100196">bug 100196</a>
from <span class="vcard"><a class="email" href="mailto:chris@chris-wilson.co.uk" title="Chris Wilson <chris@chris-wilson.co.uk>"> <span class="fn">Chris Wilson</span></a>
</span></b>
<pre>Actually it wasn't those but the merge between drm-intel-fixes and
drm-intel-next-queued:
11:37 < ickle> j4ni: I missed 8d613c539c74fa9055f88f4116196d7c820bd98f from the
reset cherry-picks
11:38 < ickle> that would avoid the silent merge conflict</pre>
</div>
</p>
<hr>
<span>You are receiving this mail because:</span>
<ul>
<li>You are the assignee for the bug.</li>
<li>You are on the CC list for the bug.</li>
<li>You are the QA Contact for the bug.</li>
</ul>
</body>
</html>