== Summary == HEAD is now at ff88655 drm-intel-nightly: 2016y-01m-11d-07h-30m-16s UTC integration manifest Applying: drm/i915/bios: add proper documentation for the Video BIOS Table (VBT) Using index info to reconstruct a base tree... M Documentation/DocBook/gpu.tmpl M drivers/gpu/drm/i915/intel_bios.c M drivers/gpu/drm/i915/intel_bios.h Falling back to patching base and 3-way merge... Auto-merging drivers/gpu/drm/i915/intel_bios.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_bios.h Auto-merging drivers/gpu/drm/i915/intel_bios.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_bios.c Patch failed at 0001 drm/i915/bios: add proper documentation for the Video BIOS Table (VBT) _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
