Switched to a new branch '20230915164231.123580-1-richard.henderson@linaro.org'
Applying: crypto: Add generic 8-bit carry-less multiply routines
Using index info to reconstruct a base tree...
M	crypto/meson.build
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in include/crypto/clmul.h
Auto-merging include/crypto/clmul.h
CONFLICT (add/add): Merge conflict in crypto/clmul.c
Auto-merging crypto/clmul.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: Add generic 8-bit carry-less multiply routines
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".