On 07/31/17 21:31, Brijesh Singh wrote:
> diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
> b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
> index d4e09c434e6a..7f42f38d1c05 100644
> --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
> +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
> - // set NumPages to suppress incorrect compiler/analyzer warnigns
> - // set NumPages to suppress incorrect compiler/analyzer warnings
> - //
> - NumPages = 0;
In order to review this patch more easily, I tried to apply it locally.
It failed, due to the above lines.
I think you may have an earlier mismerge in your local tree. Namely,
before committing e508e069a809 ("OvmfPkg/QemuFwCfgLib: Suppress GCC49
IA32 build failure", 2017-07-11), I fixed up the comment:
[[email protected]: s/warnigns/warnings/ in the code comment]
and when you pulled master later, you may have ended up with a merge
rather than a fast-forward, in your local tree.
Please fix this and I'll review this patch in the next iteration.
(Applying the patch locally helps a bit with that, because removed and
added code are unfortunately intermixed in this patch, and so the
colorizing done by "git diff --color" helps.)
Thanks
Laszlo
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel
