[edk2-devel] [PATCH v3 00/46] Added support for FT2000/4 chip

2021-03-15 Thread Ling Jia
The modules could be runed at the silicon of FT2000/4. They supported Acpi parameter configuration, Pci bus scaning, flash read-write and erase abd operating system boot function. Maintainers.txt: Added maintainers and reviewers for the DurianPkg. The public git repository is : https://github.com/

[edk2-devel] [PATCH v3 00/46] Added support for FT2000/4 chip

2021-03-15 Thread Ling Jia
The modules could be runed at the silicon of FT2000/4. They supported Acpi parameter configuration, Pci bus scaning, flash read-write and erase abd operating system boot function. Maintainers.txt: Added maintainers and reviewers for the DurianPkg. The public git repository is : https://github.com/

Re: [edk2-devel] [PATCH v3 00/46] Added support for FT2000/4 chip

2021-03-15 Thread Leif Lindholm
Hi Ling, It would appear that you have merged master into your branch instead of rebasing your branch on top of current master. The most practical solution I can think of for getting out of this bind is to: - Create a new branch, based on current master. - Use git cherry-pick to copy your commits