Switched to a new branch '20260507040153.14565-1-matthew@pq.io'
Applying: hw/misc/applesmc: fix GET_KEY_BY_INDEX to return real keys, accept WRITE/TYPE commands
Applying: hw/misc/applesmc: fix GET_KEY_BY_INDEX to return real keys, accept WRITE/TYPE commands
Using index info to reconstruct a base tree...
M	hw/misc/applesmc.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: hw/misc/applesmc: populate Apple SMC key table
Applying: hw/misc/applesmc: populate Apple SMC key table
Using index info to reconstruct a base tree...
M	hw/misc/applesmc.c
Falling back to patching base and 3-way merge...
Auto-merging hw/misc/applesmc.c
CONFLICT (content): Merge conflict in hw/misc/applesmc.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 hw/misc/applesmc: populate Apple SMC key table
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".