From: Patchwork <patchwork@emeril.freedesktop.org>
To: "Thomas Zimmermann" <tzimmermann@suse.de>
Cc: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm: Move struct drm_device.pdev to legacy (rev3)
Date: Thu, 07 Jan 2021 15:33:57 -0000 [thread overview]
Message-ID: <161003363703.21183.4684999581015610862@emeril.freedesktop.org> (raw)
In-Reply-To: <20210107080748.4768-1-tzimmermann@suse.de>
== Series Details ==
Series: drm: Move struct drm_device.pdev to legacy (rev3)
URL : https://patchwork.freedesktop.org/series/84205/
State : failure
== Summary ==
Applying: drm/amdgpu: Fix trailing whitespaces
Applying: drm/amdgpu: Remove references to struct drm_device.pdev
Applying: drm/hibmc: Remove references to struct drm_device.pdev
Applying: drm/i915: Remove references to struct drm_device.pdev
Applying: drm/i915/gt: Remove references to struct drm_device.pdev
Applying: drm/i915/gvt: Remove references to struct drm_device.pdev
Applying: drm/nouveau: Remove references to struct drm_device.pdev
Applying: drm: Upcast struct drm_device.dev to struct pci_device; replace pdev
Using index info to reconstruct a base tree...
M drivers/gpu/drm/drm_pci.c
M include/drm/drm_device.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/drm_device.h
CONFLICT (content): Merge conflict in include/drm/drm_device.h
Auto-merging drivers/gpu/drm/drm_pci.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0008 drm: Upcast struct drm_device.dev to struct pci_device; replace pdev
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:[~2021-01-07 15:33 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-07 8:07 [Intel-gfx] [PATCH v3 0/8] drm: Move struct drm_device.pdev to legacy Thomas Zimmermann
2021-01-07 8:07 ` [Intel-gfx] [PATCH v3 1/8] drm/amdgpu: Fix trailing whitespaces Thomas Zimmermann
2021-01-07 8:07 ` [Intel-gfx] [PATCH v3 2/8] drm/amdgpu: Remove references to struct drm_device.pdev Thomas Zimmermann
2021-01-18 13:50 ` Christian König
2021-01-18 14:40 ` Thomas Zimmermann
2021-01-18 14:56 ` Daniel Vetter
2021-01-18 15:02 ` Thomas Zimmermann
2021-01-07 8:07 ` [Intel-gfx] [PATCH v3 3/8] drm/hibmc: " Thomas Zimmermann
2021-01-07 8:07 ` [Intel-gfx] [PATCH v3 4/8] drm/i915: " Thomas Zimmermann
2021-01-07 8:07 ` [Intel-gfx] [PATCH v3 5/8] drm/i915/gt: " Thomas Zimmermann
2021-01-07 8:07 ` [Intel-gfx] [PATCH v3 6/8] drm/i915/gvt: " Thomas Zimmermann
2021-01-07 8:07 ` [Intel-gfx] [PATCH v3 7/8] drm/nouveau: " Thomas Zimmermann
2021-01-07 8:07 ` [Intel-gfx] [PATCH v3 8/8] drm: Upcast struct drm_device.dev to struct pci_device; replace pdev Thomas Zimmermann
2021-01-07 9:45 ` kernel test robot
2021-01-07 10:45 ` Thomas Zimmermann
2021-01-08 1:25 ` [Intel-gfx] [kbuild-all] " Rong Chen
2021-01-08 8:04 ` Thomas Zimmermann
2021-01-08 9:02 ` Daniel Vetter
2021-01-07 9:47 ` [Intel-gfx] " kernel test robot
2021-01-07 15:33 ` 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=161003363703.21183.4684999581015610862@emeril.freedesktop.org \
--to=patchwork@emeril.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=tzimmermann@suse.de \
/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).