✗ Fi.CI.BUILD: failure for Revert "tests/intel/xe _prefetch_fault: add L2 prefetch fault subtests"
Patchwork <[email protected]>
| Newsgroups | org.freedesktop.lists.igt-dev |
|---|---|
| Message-ID | <178717175773.68440.13202357774828212064@61270ab9df2a> |
== Series Details == Series: Revert "tests/intel/xe_prefetch_fault: add L2 prefetch fault subtests" URL : https://patchwork.freedesktop.org/series/172465/ State : failure == Summary == Applying: Revert "tests/intel/xe_prefetch_fault: add L2 prefetch fault subtests" Using index info to reconstruct a base tree... M tests/intel/xe_prefetch_fault.c Falling back to patching base and 3-way merge... Auto-merging tests/intel/xe_prefetch_fault.c CONFLICT (content): Merge conflict in tests/intel/xe_prefetch_fault.c Patch failed at 0001 Revert "tests/intel/xe_prefetch_fault: add L2 prefetch fault subtests" 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".