Switched to a new branch '20180611162911.3386-1-ard.biesheuvel@linaro.org'
Applying: BaseTools/tools_def IA32: disable PIE code generation explicitly
Using index info to reconstruct a base tree...
error: patch failed: BaseTools/Conf/tools_def.template:4648
error: BaseTools/Conf/tools_def.template: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Patch failed at 0001 BaseTools/tools_def IA32: disable PIE code generation explicitly
The copy of the patch that failed is found in: .git/rebase-apply/patch
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".
Failed to apply patch:
[edk2] [PATCH v2] BaseTools/tools_def IA32: disable PIE code generation explicitly