intel: sync i915_pciids.h with kernel
PATCH 1/1 intel: sync i915_pciids.h with kernel
From: Gandi Ramadevi <[email protected]>
Add DG1 PCI ID
--- intel/i915_pciids.h | 4 ++++ 1 file changed, 4 insertions(+)
intel/i915_pciids.h +4 -0
@@ -605,4 +605,8 @@INTEL_VGA_DEVICE (0x9AD9 , info), \INTEL_VGA_DEVICE (0x9AF8 , info) +/* DG1 */ +#define INTEL_DG1_IDS (info) \ + INTEL_VGA_DEVICE(0x4905, info) +#endif /* _I915_PCIIDS_H */
Signature · 6 lines
2.25.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for intel: sync i915_pciids.h with kernel
== Series Details ==
== Series Details ==
Series: intel: sync i915_pciids.h with kernel
URL : https://patchwork.freedesktop.org/series/78256/
State : failure
== Summary ==
Applying: intel: sync i915_pciids.h with kernel
Using index info to reconstruct a base tree...
A intel/i915_pciids.h
Falling back to patching base and 3-way merge... Auto-merging include/drm/i915_pciids.h
CONFLICT (content): Merge conflict in include/drm/i915_pciids.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 intel: sync i915_pciids.h with kernel 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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx