<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=Windows-1252">
</head>
<body dir="auto">
<div></div>
<div><br>
</div>
<div><br>
On Dec 5, 2017, at 6:11 PM, Stephen Rothwell <<a href="mailto:sfr@canb.auug.org.au">sfr@canb.auug.org.au</a>> wrote:<br>
<br>
</div>
<blockquote type="cite">
<div><span>Hi Rodrigo,</span><br>
<span></span><br>
<span>On Tue, 5 Dec 2017 17:19:21 -0800 Rodrigo Vivi <<a href="mailto:rodrigo.vivi@intel.com">rodrigo.vivi@intel.com</a>> wrote:</span><br>
<blockquote type="cite"><span></span><br>
</blockquote>
<blockquote type="cite"><span>We noticed that drm-intel/for-linux-next is currently disabled</span><br>
</blockquote>
<blockquote type="cite"><span>on linux-next.</span><br>
</blockquote>
<span></span><br>
<span>What gave you that idea?</span><br>
</div>
</blockquote>
<div><br>
</div>
Daniel noticed this morning and warned me that he had seen linux-next didn’t have our stuff merged yet...
<div>I put a note on my todo list and by the end of the day I checked myself and it was still the case... but probably right before you did the fix-up.</div>
<div><br>
<blockquote type="cite">
<div><span></span><br>
<blockquote type="cite"><span>I wonder if it has to do with the compilation error we had yesterday</span><br>
</blockquote>
<blockquote type="cite"><span>night (enum plane related). Was it the case?</span><br>
</blockquote>
<blockquote type="cite"><span></span><br>
</blockquote>
<blockquote type="cite"><span>Our solution on drm-tip was to fix at drm-rerere side when building</span><br>
</blockquote>
<blockquote type="cite"><span>the branches so we don't break nor are forced to mix drm-misc-next</span><br>
</blockquote>
<blockquote type="cite"><span>with drm-intel-next-queued.</span><br>
</blockquote>
<blockquote type="cite"><span></span><br>
</blockquote>
<blockquote type="cite"><span>Solution is:</span><br>
</blockquote>
<blockquote type="cite"><span>+- enum plane plane;</span><br>
</blockquote>
<blockquote type="cite"><span>++ enum i9xx_plane_id plane;</span><br>
</blockquote>
<blockquote type="cite"><span></span><br>
</blockquote>
<blockquote type="cite"><span><a href="https://cgit.freedesktop.org/drm/drm-tip/commit/?h=rerere-cache&id=481aa1c945447716ea793699e520b3ef31ef7c83~">https://cgit.freedesktop.org/drm/drm-tip/commit/?h=rerere-cache&id=481aa1c945447716ea793699e520b3ef31ef7c83~</a></span><br>
</blockquote>
<blockquote type="cite"><span></span><br>
</blockquote>
<blockquote type="cite"><span>So the ideal is to apply this when merging drm-intel/for-linux-next now.</span><br>
</blockquote>
<span></span><br>
<span>See my email earlier today which addresses exactly this.</span><br>
</div>
</blockquote>
<div><br>
</div>
<div>Yeap.. I saw your email right after sending this...</div>
<div><br>
</div>
<div>Thanks,</div>
<div>Rodrigo </div>
<br>
<blockquote type="cite">
<div><span></span><br>
<span>-- </span><br>
<span>Cheers,</span><br>
<span>Stephen Rothwell</span><br>
</div>
</blockquote>
</div>
</body>
</html>