== Series Details == Series: series starting with [CI,1/3] *** HAX FOR CI *** Revert "rtc: mc146818: Detect and handle broken RTCs" URL : https://patchwork.freedesktop.org/series/86596/ State : failure == Summary == Applying: *** HAX FOR CI *** Revert "rtc: mc146818: Detect and handle broken RTCs" Using index info to reconstruct a base tree... M drivers/rtc/rtc-cmos.c M drivers/rtc/rtc-mc146818-lib.c Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: drm-tip: 2021y-02m-02d-12h-50m-06s UTC integration manifest Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... CONFLICT (add/add): Merge conflict in integration-manifest Auto-merging integration-manifest error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0002 drm-tip: 2021y-02m-02d-12h-50m-06s UTC integration manifest 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
