Quoting Chris Wilson (2019-01-14 14:32:35) > Quoting Patchwork (2019-01-14 14:29:32) > > == Series Details == > > > > Series: series starting with [CI,01/21] drm/i915: Track all held rpm wakerefs > > URL : https://patchwork.freedesktop.org/series/55181/ > > State : failure > > > > == Summary == > > > > Applying: drm/i915: Markup paired operations on wakerefs > > Using index info to reconstruct a base tree... > > M drivers/gpu/drm/i915/i915_debugfs.c > > M drivers/gpu/drm/i915/i915_drv.h > > M drivers/gpu/drm/i915/intel_drv.h > > M drivers/gpu/drm/i915/intel_runtime_pm.c > > Falling back to patching base and 3-way merge... > > Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c > > CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_runtime_pm.c > > Auto-merging drivers/gpu/drm/i915/intel_drv.h > > CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h > > Auto-merging drivers/gpu/drm/i915/i915_drv.h > > Auto-merging drivers/gpu/drm/i915/i915_debugfs.c > > error: Failed to merge in the changes. > > The series is based on drm-tip > > commit f622ba4ad37f91237bf37fcbd6424e0c71eb4469 (tip/drm-tip, tip/HEAD) > Author: Noralf Trønnes <noralf@xxxxxxxxxxx> > Date: Mon Jan 14 12:39:36 2019 +0100 > > drm-tip: 2019y-01m-14d-11h-36m-32s UTC integration manifest > > and applies cleanly to drm-intel-next-queued. What's up? I'm confident in the previous good results... I hope not overly. -Chris _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
