> -----Original Message----- > From: linux-yocto@lists.yoctoproject.org <linux-yocto@lists.yoctoproject.org> > On Behalf Of Bruce Ashfield > Sent: Wednesday, April 10, 2024 1:00 AM > To: Li, Meng <meng...@windriver.com> > Cc: linux-yocto@lists.yoctoproject.org > Subject: Re: [linux-yocto]: [kernel v6.6 std/rt]: nxp-bsp: patches for linux- > yocto-v6.6 kernel > > CAUTION: This email comes from a non Wind River email account! > Do not click links or open attachments unless you recognize the sender and > know the content is safe. > > In message: [linux-yocto]: [kernel v6.6 std/rt]: nxp-bsp: patches for linux- > yocto-v6.6 kernel > on 09/04/2024 Meng Li wrote: > > > From: Limeng <meng...@windriver.com> > > > > Hi Bruce, > > > > I get patches from NXP kernel repo https://github.com/nxp-imx/linux- > imx.git lf-6.6.y, > > and intend to merge them into linux-yocto. > > > > There are 4939 patches in my public repo https://github.com/limeng- > linux/linux-yocto-bsp.git, branch v6.6/standard/nxp-sdk-6.6/nxp-soc. > > Could you please help to create branch v6.6/standard/nxp-sdk-6.6/nxp-soc > based on v6.6/standard/base, and then merge these patches into it? > > Could you please also help to create branch v6.6/standard/preempt-rt/nxp- > sdk-6.6/nxp-soc based on v6.6/standard/preempt-rt/base, and then > > merge these patches into it? > > Can you double check this against the latest 6.6 changes > in linux-yocto ? > > I just tried the merge and got the following conflicts: > > Unmerged paths: > (use "git add <file>..." to mark resolution) > both modified: arch/arm64/boot/dts/freescale/imx8mm.dtsi > both modified: arch/arm64/boot/dts/freescale/imx8mp-evk.dts > both modified: arch/arm64/boot/dts/freescale/imx8mp.dtsi > both modified: arch/arm64/boot/dts/freescale/imx8mq.dtsi > both modified: drivers/clk/imx/clk-imx8qxp.c > both modified: drivers/dma/fsl-edma-common.c > both modified: drivers/dma/fsl-edma.c > both modified: drivers/dma/fsl-qdma.c > both modified: drivers/firmware/arm_scmi/perf.c > both modified: drivers/gpio/Kconfig > both modified: drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c > both modified: drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c > both modified: drivers/net/ethernet/freescale/fec_main.c > both modified: drivers/net/ethernet/freescale/fman/fman_memac.c > both modified: drivers/phy/freescale/phy-fsl-imx8-mipi-dphy.c > both modified: drivers/scsi/scsi_error.c > both modified: drivers/spi/spi-imx.c > both modified: sound/soc/fsl/fsl_sai.c >
Thanks for showing me the conflict files, I applied the SDK patches based on v6.6.24. I will improve these patches based on latest v6.6.25. Thanks, Limeng > Bruce > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13785): https://lists.yoctoproject.org/g/linux-yocto/message/13785 Mute This Topic: https://lists.yoctoproject.org/mt/105419365/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
