From: Chris Wilson <chris@chris-wilson.co.uk>
To: Patchwork <patchwork@emeril.freedesktop.org>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: ✗ Fi.CI.BAT: failure for series starting with [CI,01/21] drm/i915: Track all held rpm wakerefs
Date: Mon, 14 Jan 2019 14:32:35 +0000 [thread overview]
Message-ID: <154747635002.28151.6607551729538432365@skylake-alporthouse-com> (raw)
In-Reply-To: <20190114142932.24566.50380@emeril.freedesktop.org>
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@tronnes.org>
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?
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-01-14 14:32 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-14 14:21 [CI 01/21] drm/i915: Track all held rpm wakerefs Chris Wilson
2019-01-14 14:21 ` [CI 02/21] drm/i915: Markup paired operations on wakerefs Chris Wilson
2019-01-14 14:21 ` [CI 03/21] drm/i915: Track GT wakeref Chris Wilson
2019-01-14 14:21 ` [CI 04/21] drm/i915: Track the rpm wakerefs for error handling Chris Wilson
2019-01-14 14:21 ` [CI 05/21] drm/i915: Mark up sysfs with rpm wakeref tracking Chris Wilson
2019-01-14 14:21 ` [CI 06/21] drm/i915: Mark up debugfs " Chris Wilson
2019-01-14 14:21 ` [CI 07/21] drm/i915/perf: Track the rpm wakeref Chris Wilson
2019-01-14 14:21 ` [CI 08/21] drm/i915/pmu: Track " Chris Wilson
2019-01-14 14:21 ` [CI 09/21] drm/i915/guc: Track the " Chris Wilson
2019-01-14 14:21 ` [CI 10/21] drm/i915/gem: Track the rpm wakerefs Chris Wilson
2019-01-14 14:21 ` [CI 11/21] drm/i915/fb: Track " Chris Wilson
2019-01-14 14:21 ` [CI 12/21] drm/i915/hotplug: Track temporary rpm wakeref Chris Wilson
2019-01-14 14:21 ` [CI 13/21] drm/i915/panel: " Chris Wilson
2019-01-14 14:21 ` [CI 14/21] drm/i915/selftests: Mark up rpm wakerefs Chris Wilson
2019-01-14 14:21 ` [CI 15/21] drm/i915: Syntatic sugar for using intel_runtime_pm Chris Wilson
2019-01-14 14:21 ` [CI 16/21] drm/i915: Markup paired operations on display power domains Chris Wilson
2019-01-14 14:21 ` [CI 17/21] drm/i915: Track the wakeref used to initialise " Chris Wilson
2019-01-14 14:21 ` [CI 18/21] drm/i915/dp: Markup pps lock power well Chris Wilson
2019-01-14 14:21 ` [CI 19/21] drm/i915: Complain if hsw_get_pipe_config acquires the same power well twice Chris Wilson
2019-01-14 14:21 ` [CI 20/21] drm/i915: Combined gt.awake/gt.power wakerefs Chris Wilson
2019-01-14 15:04 ` Mika Kuoppala
2019-01-14 14:21 ` [CI 21/21] drm/i915: Mark up Ironlake ips with rpm wakerefs Chris Wilson
2019-01-14 14:29 ` ✗ Fi.CI.BAT: failure for series starting with [CI,01/21] drm/i915: Track all held " Patchwork
2019-01-14 14:32 ` Chris Wilson [this message]
2019-01-14 17:33 ` Chris Wilson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=154747635002.28151.6607551729538432365@skylake-alporthouse-com \
--to=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
--cc=patchwork@emeril.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.