DO NOT MERGE.
Apologies, but my commit message is actually incorrect here, this
actually fixes two patches. It seems that despite applying cleanly, one
of the patches did somehow not get merged correctly. I will send a v3 in
a few minutes.
Thanks,
Cal
On 10/14/2016 03:17 PM, California
Portions of commit e153f52df9 "drm/i915: Check VBT for port presence in
addition to the strap on VLV/CHV" were missed in the merge commit,
causing build errors. This patch fixes the issues by reverting the i915
changes in the merge, reapplying the patches and fixing conflicts
where they occur,
