FYI Ref https://github.com/openwrt/openwrt/pull/4691
> The original patch is from and signed off by Li Zhang li.zh...@gl-inet.com > which can be seen from gl-inet@3b71749 > and > http://lists.openwrt.org/pipermail/openwrt-devel/2021-September/036363.html > > However, as of 2021-10-17, the above-mentioned patch has merge conflict with > several upstream branches, > at least master and openwrt-21.02. This commit resolves the merge conflict, > but also > ignore changes to package/libs/uclient/Makefile. > > This change has been tested by TruongSinh Tran-Nguyen i...@truongsinh.pro. > Basic Wifi functionalities work, but 8GB EMMC cannot be accessed/mounted, > potentially due to lack of his knowledge how to do so. > > Bluetooth and Zigbee have not been tested. Kind regards, Sinh TruongSinh Tran-Nguyen, PMI-ACP, PSM III, PSPO III Tech Visionary, Craftsman, Coach and Investor +1-6127-TR-SINH (+1-6127-87-7464) | @truongsinhtn Find me on LinkedIn | Twitter | Github | StackOverflow IBAN: LT76 3250 0264 6898 1177 | BIC: REVOLT21 Currently Reading Get your own email signature Kind regards, Sinh TruongSinh Tran-Nguyen, PMI-ACP, PSM III, PSPO III Tech Visionary, Craftsman, Coach and Investor +1-6127-TR-SINH (+1-6127-87-7464) | @truongsinhtn Find me on LinkedIn | Twitter | Github | StackOverflow IBAN: LT76 3250 0264 6898 1177 | BIC: REVOLT21 Currently Reading Get your own email signature On Sat, Oct 16, 2021 at 8:07 PM TruongSinh Tran-Nguyen <i...@truongsinh.pro> wrote: > > This patch now has merge conflict with tag v21.02.0 > > ``` > Unmerged paths: > > (use "git add <file>..." to mark resolution) > > > > both modified: package/firmware/ipq-wifi/Makefile > > both modified: package/libs/uclient/Makefile > > both modified: > target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata > > both modified: target/linux/ipq40xx/image/Makefile > > both modified: > target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch > > > > ``` > > Kind regards, _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
