AnsweredAssumed Answered

zyh@kszn-rd:~/work/copy/branch/imx6dl/kernel_imx$ git am --ignore-space-change --ignore-whitespace *.patch previous rebase directory /home/zyh/work/copy/branch/imx6dl/.git/rebase-apply still exists but mbox given. zyh@kszn-rd:~/work/copy/branch/imx6dl/ker

Question asked by yuehan zhu on Sep 28, 2015
Latest reply on Sep 29, 2015 by gusarambula

i.MX 6 Android JB 4.3_1.1.1 Patch,I follow the i.MX 6 Android JB 4.3_1.1.1 Patch Release Notes,but following a problem

 

 

zyh@kszn-rd:~/work/copy/branch/imx6dl/kernel_imx$ git am --ignore-space-change --ignore-whitespace *.patch

previous rebase directory /home/zyh/work/copy/branch/imx6dl/.git/rebase-apply still exists but mbox given.

zyh@kszn-rd:~/work/copy/branch/imx6dl/kernel_imx$ git am --abort

zyh@kszn-rd:~/work/copy/branch/imx6dl/kernel_imx$ git am --ignore-space-change --ignore-whitespace *.patch

Applying: ENGR00306257 [#1027]fix system hang up issue caused by GPU

error: drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c: does not exist in index

Patch failed at 0001 ENGR00306257 [#1027]fix system hang up issue caused by GPU

When you have resolved this problem run "git am --resolved".

If you would prefer to skip this patch, instead run "git am --skip".

To restore the original branch and stop patching run "git am --abort".

Outcomes