Switched to a new branch 'cover.1727630000.git.yong.huang@smartx.com'
Applying: migration: Support background ramblock dirty sync
Using index info to reconstruct a base tree...
M	include/migration/misc.h
M	migration/migration.c
M	migration/ram.c
M	migration/ram.h
M	migration/trace-events
M	system/cpu-timers.c
M	tests/qtest/migration-test.c
Falling back to patching base and 3-way merge...
Auto-merging tests/qtest/migration-test.c
CONFLICT (content): Merge conflict in tests/qtest/migration-test.c
Auto-merging system/cpu-timers.c
CONFLICT (content): Merge conflict in system/cpu-timers.c
Auto-merging migration/trace-events
Auto-merging migration/ram.h
Auto-merging migration/ram.c
Auto-merging migration/migration.c
CONFLICT (content): Merge conflict in migration/migration.c
Auto-merging include/migration/misc.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 migration: Support background ramblock dirty sync
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".