Switched to a new branch 'cover.1745921177.git.jdenemar@redhat.com'
Applying: cputest: Add data for Intel(R) Core(TM) i7-1270P CPU
Using index info to reconstruct a base tree...
M	tests/cputest.c
Falling back to patching base and 3-way merge...
Auto-merging tests/cputest.c
CONFLICT (content): Merge conflict in tests/cputest.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 cputest: Add data for Intel(R) Core(TM) i7-1270P CPU
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".