[Intel-gfx] ✗ Fi.CI.BAT: failure for PSR clean-up, new vfuncs and more use of HW tracking. (rev3)

[Patchwork]

== Series Details ==

Series: PSR clean-up, new vfuncs and more use of HW tracking. (rev3)
URL   : https://patchwork.freedesktop.org/series/27194/
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
  CHK     kernel/config_data.h
  CC [M]  drivers/gpu/drm/i915/intel_psr.o
drivers/gpu/drm/i915/intel_psr.c: In function ‘intel_psr_enable’:
drivers/gpu/drm/i915/intel_psr.c:547:1: error: expected expression before ‘<<’ token
 <<<<<<< 9e8f83846114215a62362801b9fb8a7908c35b6d
 ^
drivers/gpu/drm/i915/intel_psr.c:547:9: error: invalid suffix "f83846114215a62362801b9fb8a7908c35b6d" on floating constant
 <<<<<<< 9e8f83846114215a62362801b9fb8a7908c35b6d
         ^
drivers/gpu/drm/i915/intel_psr.c:550:1: error: expected expression before ‘==’ token
 =======
 ^
drivers/gpu/drm/i915/intel_psr.c:552:1: error: expected expression before ‘>>’ token
 >>>>>>> drm/i915/psr: Re-org Activate after enable
 ^
scripts/Makefile.build:302: recipe for target 'drivers/gpu/drm/i915/intel_psr.o' failed
make[4]: *** [drivers/gpu/drm/i915/intel_psr.o] Error 1
scripts/Makefile.build:561: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2
scripts/Makefile.build:561: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:561: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1016: recipe for target 'drivers' failed
make: *** [drivers] Error 2