Switched to a new branch '20180806084449.19468-1-shenglei.zhang@intel.com'
Applying: IntelFrameworkModulePkg:Remove redundant definitions and comments
error: patch failed: IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.h:24
error: IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaDriver.h: patch does not apply
error: patch failed: IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf:62
error: IntelFrameworkModulePkg/Bus/Isa/IsaIoDxe/IsaIoDxe.inf: patch does not apply
error: patch failed: IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c:1848
error: IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c: patch does not apply
error: patch failed: IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h:299
error: IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h: patch does not apply
error: patch failed: IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c:2676
error: IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ata.c: patch does not apply
error: patch failed: IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c:33
error: IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/DriverConfiguration.c: patch does not apply
error: patch failed: IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.h:768
error: IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/Ide.h: patch does not apply
error: patch failed: IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16.h:1019
error: IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/BiosSnp16.h: patch does not apply
error: patch failed: IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/PxeUndi.c:564
error: IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/PxeUndi.c: patch does not apply
error: patch failed: IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf:72
error: IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf: patch does not apply
error: patch failed: IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h:63
error: IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h: patch does not apply
error: patch failed: IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BmLib.c:323
error: IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BmLib.c: patch does not apply
error: patch failed: IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h:548
error: IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h: patch does not apply
error: patch failed: IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c:1192
error: IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c: patch does not apply
error: patch failed: IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c:218
error: IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c: patch does not apply
error: patch failed: IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c:312
error: IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c: patch does not apply
error: patch failed: IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c:569
error: IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c: patch does not apply
error: patch failed: IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h:198
error: IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h: 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 IntelFrameworkModulePkg:Remove redundant definitions and comments
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] IntelFrameworkModulePkg:Remove redundant definitions and comments