On Mon, Nov 14, 2016 at 9:29 AM, Heyi Guo heyi.guo@linaro.org wrote:
Code can also be found in my linaro repo: http://git.linaro.org/people/heyi.guo/OpenPlatformPkg.git branch: rp-16.12-08-d02-d03
Looks like this branch is not rebased on the latest content from OPP master, and I also got a conflict when trying to merge it on master (CONFLICT: Merge conflict in Chips/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitLib.c).
This branch seems to also contain rp-16.12-07-d05, while the latest d05 series is available as rp-16.12-12-d05. Should this branch also be rebased on top of rp-16.12-12-d05 instead?
Thanks,