On Fri, Oct 14, 2016 at 02:14:02PM -0700, California Sullivan wrote:
> The addition of a new function and some return types was missed in the
> original merge, causing build errors.
>
If it were me, I would want to have details on exactly which patches had
conflicts, since it appears you went pat
On 10/14/2016 02:19 PM, Ernst, Eric wrote:
On Fri, Oct 14, 2016 at 02:14:02PM -0700, California Sullivan wrote:
The addition of a new function and some return types was missed in the
original merge, causing build errors.
If it were me, I would want to have details on exactly which patches ha
The addition of a new function and some return types was missed in the
original merge, causing build errors.
Signed-off-by: California Sullivan
---
drivers/gpu/drm/i915/i915_drv.h | 1 +
drivers/gpu/drm/i915/intel_bios.c| 39
drivers/gpu/drm/i915/in
