From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Hans de Goede" <hdegoede@redhat.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915 Support for integrated privacy screen (rev2)
Date: Mon, 06 Jul 2020 12:55:57 -0000 [thread overview]
Message-ID: <159404015709.17683.16970869538306690034@emeril.freedesktop.org> (raw)
In-Reply-To: <20200312185629.141280-1-rajatja@google.com>
== Series Details ==
Series: drm/i915 Support for integrated privacy screen (rev2)
URL : https://patchwork.freedesktop.org/series/74650/
State : failure
== Summary ==
Applying: intel_acpi: Rename drm_dev local variable to dev
Applying: drm/connector: Add support for privacy-screen property
Applying: drm/i915: Lookup and attach ACPI device node for connectors
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/display/intel_display_types.h
M drivers/gpu/drm/i915/display/intel_dp.c
M drivers/gpu/drm/i915/i915_drv.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c
Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 drm/i915: Lookup and attach ACPI device node for connectors
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2020-07-06 12:55 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-12 18:56 [Intel-gfx] [PATCH v9 0/5] drm/i915 Support for integrated privacy screen Rajat Jain
2020-03-12 18:56 ` [Intel-gfx] [PATCH v9 1/5] intel_acpi: Rename drm_dev local variable to dev Rajat Jain
2020-03-12 18:56 ` [Intel-gfx] [PATCH v9 2/5] drm/connector: Add support for privacy-screen property Rajat Jain
2020-03-12 18:56 ` [Intel-gfx] [PATCH v9 3/5] drm/i915: Lookup and attach ACPI device node for connectors Rajat Jain
2020-03-12 18:56 ` [Intel-gfx] [PATCH v9 4/5] drm/i915: Add helper code for ACPI privacy screen Rajat Jain
2020-03-12 18:56 ` [Intel-gfx] [PATCH v9 5/5] drm/i915: Enable support for integrated " Rajat Jain
2020-07-06 12:51 ` Hans de Goede
2020-07-07 0:50 ` Rajat Jain
2021-03-09 20:38 ` Rajat Jain
2020-03-12 19:12 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915 Support " Patchwork
2020-03-12 19:35 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-03-13 9:20 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2020-03-25 18:21 ` [Intel-gfx] [PATCH v9 0/5] " Rajat Jain
2020-07-06 12:55 ` Patchwork [this message]
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=159404015709.17683.16970869538306690034@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=hdegoede@redhat.com \
--cc=intel-gfx@lists.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).