1-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
This patch now has merge conflict with tag v21.02.0
```
Unmerged paths:
(use "git add ..." 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-