Switched to a new branch '20180813024519.5704-1-songpeng.li@intel.com' Applying: NetworkPkg: Remove the redundant code and definition. error: patch failed: NetworkPkg/IScsiDxe/IScsiDxe.inf:124 error: NetworkPkg/IScsiDxe/IScsiDxe.inf: patch does not apply error: patch failed: NetworkPkg/IScsiDxe/IScsiProto.c:2096 error: NetworkPkg/IScsiDxe/IScsiProto.c: patch does not apply error: patch failed: NetworkPkg/IpSecDxe/Ikev2/Payload.c:3104 error: NetworkPkg/IpSecDxe/Ikev2/Payload.c: patch does not apply error: patch failed: NetworkPkg/IpSecDxe/Ikev2/Utility.c:290 error: NetworkPkg/IpSecDxe/Ikev2/Utility.c: patch does not apply error: patch failed: NetworkPkg/IpSecDxe/Ikev2/Utility.h:104 error: NetworkPkg/IpSecDxe/Ikev2/Utility.h: patch does not apply error: patch failed: NetworkPkg/TcpDxe/TcpOption.c:342 error: NetworkPkg/TcpDxe/TcpOption.c: patch does not apply error: patch failed: NetworkPkg/TcpDxe/TcpOption.h:126 error: NetworkPkg/TcpDxe/TcpOption.h: patch does not apply error: patch failed: NetworkPkg/TlsDxe/TlsDxe.inf:52 error: NetworkPkg/TlsDxe/TlsDxe.inf: patch does not apply error: patch failed: NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c:202 error: NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c: patch does not apply error: patch failed: NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.h:116 error: NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.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... M NetworkPkg/IScsiDxe/IScsiDxe.inf Patch failed at 0001 NetworkPkg: Remove the redundant code and definition. 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] NetworkPkg: Remove the redundant code and definition.