Switched to a new branch '20180810014348.32036-1-hao.a.wu@intel.com' Applying: UefiCpuPkg/SmmCpuFeaturesLib: Add RSB stuffing before rsm instruction error: patch failed: UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.nasm:37 error: UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiEntry.nasm: patch does not apply error: patch failed: UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.nasm:1 error: UefiCpuPkg/Library/SmmCpuFeaturesLib/Ia32/SmiException.nasm: patch does not apply error: patch failed: UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.nasm:48 error: UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiEntry.nasm: patch does not apply error: patch failed: UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.nasm:30 error: UefiCpuPkg/Library/SmmCpuFeaturesLib/X64/SmiException.nasm: patch does not apply error: Did you hand edit your patch? It does not apply to blobs recorded in its index. Using index info to reconstruct a base tree... Patch failed at 0001 UefiCpuPkg/SmmCpuFeaturesLib: Add RSB stuffing before rsm instruction 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 1/2] UefiCpuPkg/SmmCpuFeaturesLib: Add RSB stuffing before rsm instruction