[linux-yocto] [PATCH 0/2] Fix merge errors on bxt-rebase branch

[Bruce Ashfield]

On 2016-11-16 01:20 AM, Jukka Laitinen wrote:
> The i915 module stopped compiling in 4.4.30 rebase. These patches fix the
> merge errors causing this.

merged.

Note: These changes are also on top of a 4.4.32 -stable release that I
integrated yesterday.

Bruce

>
> Jukka Laitinen (2):
>   Revert "UPSTREAM: drm/i915: take a power domain ref only when needed
>     during HDMI detect"
>   Fix merge errors for i915 to compile
>
>  drivers/gpu/drm/i915/intel_drv.h  |  3 ---
>  drivers/gpu/drm/i915/intel_hdmi.c | 12 +++++-------
>  2 files changed, 5 insertions(+), 10 deletions(-)
>