Hi Eric, The conversation with you, Ilkka, and Fei seems to point towards just fixing the few merge conflicts we get with stable, so that's what I have here. I have built and boot tested this patch but I don't know if I have the process correct. This is a squashed version of reverting the i915 merge from v4.4.20 -> v4.4.22, then reapplying the patches and fixing them as needed. Let me know if I should send that series instead, or do something entirely different.
Bruce, If Eric gives the OK go ahead and merge this. Thanks, Cal Sullivan California Sullivan (1): drm/i915: Fix v4.4.20 -> v4.4.22 i915 merge. drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_bios.c | 39 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_display.c | 2 ++ drivers/gpu/drm/i915/intel_dp.c | 6 +++--- drivers/gpu/drm/i915/intel_drv.h | 2 +- 5 files changed, 46 insertions(+), 4 deletions(-) -- 2.5.5 -- _______________________________________________ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
