On Wed, Feb 26, 2020 at 11:44 PM Quanyang Wang
<[email protected]> wrote:
>
> Hi Bruce,
>
> Would you please help create branch v5.4/standard/xlnx-soc on
> linux-yocto and pull patches from linux-yocto-dev/v5.4/standard/xlnx-soc ?
There are conflicts with the xlnx-dev patches between v5.4.20 and the
v5.4.11 that I have on -dev:
both modified: drivers/gpio/gpio-zynq.c
both modified: drivers/mtd/spi-nor/spi-nor.c
both modified: drivers/net/ethernet/xilinx/xilinx_axienet_main.c
both modified: drivers/of/Kconfig
both modified: drivers/usb/dwc3/gadget.c
(and in yaffs2).
I resolved the issues by taking (for the most part) what was in the
-dev version of xlnx-soc, and my v5.4 yaffs2 changes.
Send follow up patches to fix whatever I may have broken.
Bruce
>
> Thanks,
>
> Quanyang
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8420):
https://lists.yoctoproject.org/g/linux-yocto/message/8420
Mute This Topic: https://lists.yoctoproject.org/mt/71581346/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
