Switched to a new branch '20180817023511.6420-1-hao.a.wu@intel.com' Applying: UefiCpuPkg/PiSmmCpuDxeSmm: [CVE-2017-5715] Stuff RSB before RSM error: patch failed: UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm:18 error: UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiEntry.nasm: patch does not apply error: patch failed: UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm:18 error: UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm: patch does not apply error: patch failed: UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm:18 error: UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmiEntry.nasm: patch does not apply error: patch failed: UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.nasm:18 error: UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmInit.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/PiSmmCpuDxeSmm: [CVE-2017-5715] Stuff RSB before RSM 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 v3 1/2] UefiCpuPkg/PiSmmCpuDxeSmm: [CVE-2017-5715] Stuff RSB before RSM