Switched to a new branch '1e4d59a49e7f2e02cf522e799a7bf5f3fa3fba1f.1722414006.git.git@dprinz.de'
Applying: hw/acpi/ich9: Add periodic and swsmi timer
Using index info to reconstruct a base tree...
M	hw/acpi/ich9.c
M	hw/acpi/meson.build
M	hw/i386/pc.c
M	hw/isa/lpc_ich9.c
M	include/hw/acpi/ich9.h
M	include/hw/southbridge/ich9.h
Falling back to patching base and 3-way merge...
Auto-merging include/hw/southbridge/ich9.h
Auto-merging hw/isa/lpc_ich9.c
CONFLICT (content): Merge conflict in hw/isa/lpc_ich9.c
Auto-merging hw/i386/pc.c
Auto-merging hw/acpi/meson.build
Auto-merging hw/acpi/ich9.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 hw/acpi/ich9: Add periodic and swsmi timer
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".