<p style="white-space: pre-wrap; word-wrap: break-word;">Could you please merge the files in this patch except for the following conflicting one? <br>I will push it in a different patch later on.</p><p style="white-space: pre-wrap; word-wrap: break-word;">src/arch/x86/acpigen.c</p><p style="white-space: pre-wrap; word-wrap: break-word;">Regards,<br>Francois</p><p><a href="https://review.coreboot.org/c/coreboot/+/30098">View Change</a></p><ul style="list-style: none; padding: 0;"></ul><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/30098">change 30098</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/c/coreboot/+/30098"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I38a8910e68b7a8ce0e97ca4cdb9ef7f595c0e319 </div>
<div style="display:none"> Gerrit-Change-Number: 30098 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Francois Toguo Fotso <francois.toguo.fotso@intel.com> </div>
<div style="display:none"> Gerrit-Reviewer: Francois Toguo Fotso <francois.toguo.fotso@intel.com> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>
<div style="display:none"> Gerrit-Comment-Date: Tue, 11 Dec 2018 22:22:44 +0000 </div>
<div style="display:none"> Gerrit-HasComments: No </div>
<div style="display:none"> Gerrit-Has-Labels: No </div>
<div style="display:none"> Gerrit-MessageType: comment </div>