<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:#0563C1;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:#954F72;
text-decoration:underline;}
pre
{mso-style-priority:99;
mso-style-link:"HTML Preformatted Char";
margin:0cm;
margin-bottom:.0001pt;
font-size:10.0pt;
font-family:"Courier New";}
span.EmailStyle17
{mso-style-type:personal-compose;
font-family:"Calibri",sans-serif;
color:windowtext;}
span.apple-converted-space
{mso-style-name:apple-converted-space;}
span.HTMLPreformattedChar
{mso-style-name:"HTML Preformatted Char";
mso-style-priority:99;
mso-style-link:"HTML Preformatted";
font-family:"Courier New";}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri",sans-serif;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-US" link="#0563C1" vlink="#954F72">
<div class="WordSection1">
<pre><span style="font-size:11.5pt;color:#333333">2016-10-12T11:18:46.661105 <a href="https://patchwork.freedesktop.org/api/1.0/series/13637/revisions/1/mbox/"><span style="color:#5C3566">https://patchwork.freedesktop.org/api/1.0/series/13637/revisions/1/mbox/</span></a><o:p></o:p></span></pre>
<pre><span style="font-size:11.5pt;color:#333333">NEW SINCE: 2016-10-12T11:18:46.661105<o:p></o:p></span></pre>
<pre><span style="font-size:11.5pt;color:#333333">Series 13637v1 Series without cover letter<o:p></o:p></span></pre>
<pre><span style="font-size:11.5pt;color:#333333">HEAD is now at 14740bb drm-intel-nightly: 2016y-10m-12d-16h-18m-24s UTC integration manifest<o:p></o:p></span></pre>
<pre><span style="font-size:11.5pt;color:#333333">Download and apply patch: <a href="https://patchwork.freedesktop.org/api/1.0/series/13637/revisions/1/mbox/"><span style="color:#5C3566">https://patchwork.freedesktop.org/api/1.0/series/13637/revisions/1/mbox/</span></a><o:p></o:p></span></pre>
<pre><span style="font-size:11.5pt;color:#333333">Applying: drm/i915: Use fence_write() from rpm resume<o:p></o:p></span></pre>
<pre><span style="font-size:11.5pt;color:#333333">Using index info to reconstruct a base tree...<o:p></o:p></span></pre>
<pre><span style="font-size:11.5pt;color:#333333">M drivers/gpu/drm/i915/i915_gem_fence.c<o:p></o:p></span></pre>
<pre><span style="font-size:11.5pt;color:#333333">Falling back to patching base and 3-way merge...<o:p></o:p></span></pre>
<pre><span style="font-size:11.5pt;color:#333333">Auto-merging drivers/gpu/drm/i915/i915_gem_fence.c<o:p></o:p></span></pre>
<pre><span style="font-size:11.5pt;color:#333333">CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_fence.c<o:p></o:p></span></pre>
<pre><span style="font-size:11.5pt;color:#333333">error: Failed to merge in the changes.<o:p></o:p></span></pre>
<pre><span style="font-size:11.5pt;color:#333333">Patch failed at 0001 drm/i915: Use fence_write() from rpm resume<o:p></o:p></span></pre>
<pre><span style="font-size:11.5pt;color:#333333">The copy of the patch that failed is found in: .git/rebase-apply/patch<o:p></o:p></span></pre>
<pre><span style="font-size:11.5pt;color:#333333">When you have resolved this problem, run "git am --continue".<o:p></o:p></span></pre>
<pre><span style="font-size:11.5pt;color:#333333">If you prefer to skip this patch, run "git am --skip" instead.<o:p></o:p></span></pre>
<pre><span style="font-size:11.5pt;color:#333333">To restore the original branch and stop patching, run "git am --abort".<o:p></o:p></span></pre>
<pre><span style="font-size:11.5pt;color:#333333">Series 13637 revision 1 was fully merged or fully failed: no git log<o:p></o:p></span></pre>
<pre><span style="font-size:11.5pt;color:#333333">Build step 'Execute shell' marked build as failure<o:p></o:p></span></pre>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">Jani Saarinen (behalf of trybot)<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
</body>
</html>