Switched to a new branch '20240904235230.199672-1-tiago.pasqualini@canonical.com'
Applying: crypto: run qcrypto_pbkdf2_count_iters in a new thread
Using index info to reconstruct a base tree...
M	crypto/pbkdf.c
Falling back to patching base and 3-way merge...
Auto-merging crypto/pbkdf.c
CONFLICT (content): Merge conflict in crypto/pbkdf.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 crypto: run qcrypto_pbkdf2_count_iters in a new thread
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".