== 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@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
