[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915/kbl: Remove unused Kabylake pci ids (rev2)

[Patchwork]

== Series Details ==

Series: series starting with [1/2] drm/i915/kbl: Remove unused Kabylake pci ids (rev2)
URL   : https://patchwork.freedesktop.org/series/30151/
State : failure

== Summary ==

  CHK     include/config/kernel.release
  CHK     include/generated/uapi/linux/version.h
  CHK     include/generated/utsrelease.h
  CHK     include/generated/bounds.h
  CHK     include/generated/timeconst.h
  CHK     include/generated/asm-offsets.h
  CALL    scripts/checksyscalls.sh
  CHK     scripts/mod/devicetable-offsets.h
  CHK     include/generated/compile.h
  CC      arch/x86/kernel/early-quirks.o
In file included from ./include/drm/i915_drm.h:29:0,
                 from arch/x86/kernel/early-quirks.c:19:
./include/drm/i915_pciids.h:38:36: error: expected identifier or ‘(’ before ‘{’ token
 #define INTEL_VGA_DEVICE(id, info) {  \
                                    ^
./include/drm/i915_pciids.h:341:2: note: in expansion of macro ‘INTEL_VGA_DEVICE’
  INTEL_VGA_DEVICE(0x5917, info), /* DT  GT1.5 */ \
  ^~~~~~~~~~~~~~~~
./include/drm/i915_pciids.h:341:32: error: expected identifier or ‘(’ before ‘,’ token
  INTEL_VGA_DEVICE(0x5917, info), /* DT  GT1.5 */ \
                                ^
./include/drm/i915_pciids.h:343:32: error: expected identifier or ‘(’ before ‘,’ token
  INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \
                                ^
./include/drm/i915_pciids.h:344:32: error: expected identifier or ‘(’ before ‘,’ token
  INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \
                                ^
./include/drm/i915_pciids.h:346:32: error: expected identifier or ‘(’ before ‘,’ token
  INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \
                                ^
./include/drm/i915_pciids.h:347:32: error: expected identifier or ‘(’ before ‘,’ token
  INTEL_VGA_DEVICE(0x5902, info), /* DT  GT1 */ \
                                ^
./include/drm/i915_pciids.h:340:1: error: expected expression before ‘<<’ token
 <<<<<<< HEAD
 ^
./include/drm/i915_pciids.h:364:2: note: in expansion of macro ‘INTEL_KBL_GT1_IDS’
  INTEL_KBL_GT1_IDS(info), \
  ^~~~~~~~~~~~~~~~~
arch/x86/kernel/early-quirks.c:528:2: note: in expansion of macro ‘INTEL_KBL_IDS’
  INTEL_KBL_IDS(&gen9_early_ops),
  ^~~~~~~~~~~~~
scripts/Makefile.build:311: recipe for target 'arch/x86/kernel/early-quirks.o' failed
make[2]: *** [arch/x86/kernel/early-quirks.o] Error 1
scripts/Makefile.build:570: recipe for target 'arch/x86/kernel' failed
make[1]: *** [arch/x86/kernel] Error 2
Makefile:1019: recipe for target 'arch/x86' failed
make: *** [arch/x86] Error 2