Re: [linux-yocto]: [kernel v6.6 std/rt]: nxp-bsp: patches for linux-yocto-v6.6 kernel
> -Original Message- > From: linux-yocto@lists.yoctoproject.org > On Behalf Of Bruce Ashfield > Sent: Wednesday, April 10, 2024 1:00 AM > To: Li, Meng > 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 > > > > 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 ..." 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] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto]: [kernel/kernel-rt v6.1]: dmaengine: imx-sdma: move memory copy operation before dma map
merged. Bruce In message: [linux-yocto]: [kernel/kernel-rt v6.1]: dmaengine: imx-sdma: move memory copy operation before dma map on 08/04/2024 Meng Li wrote: > From: Limeng > > Hi Bruce, > > This patch is used to move memory copy operation before dma map > Could you please help merge this patch into linux-ycoto kernel? > Branch are v6.1/standard/nxp-sdk-6.1/nxp-soc and > v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc > > > diffstat info as below: > > imx-sdma.c |4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > thanks, > Limeng -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13783): https://lists.yoctoproject.org/g/linux-yocto/message/13783 Mute This Topic: https://lists.yoctoproject.org/mt/105397624/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] Trial merge of v6.1.84 for linux-yocto
In message: [linux-yocto] Trial merge of v6.1.84 for linux-yocto
on 05/04/2024 Kevin Hao wrote:
> Hi Bruce,
>
> This is a trial merge of the stable kernel v6.1.84 for the following branches
> in the linux-yocto.
> 7e8aba41d616 v6.1/standard/sdkv5.10/axxia
> 20b864b63270 v6.1/standard/preempt-rt/sdkv5.10/axxia
>#Have textual conflicts
> 6e7505a77dab v6.1/standard/base
> a0836e0ed8b0 v6.1/standard/preempt-rt/base
>#Have textual conflicts
> c8a6a6ede39b v6.1/standard/ti-sdk-6.1/ti-j7xxx
>#Have textual and semantic conflicts
> 6b0bd6c88b2b v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
>#Have textual and semantic conflicts
> 39ae0de6c0d0 v6.1/standard/nxp-sdk-6.1/nxp-soc
> fb59778024f1 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
>#Have textual conflicts
> e3971ab030ed v6.1/standard/cn-sdkv5.15/octeon
> 459b44937628 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
>#Have textual conflicts
> cd0f526a7e68 v6.1/standard/cn-sdkv6.1/octeon
> af294cdc7744 v6.1/standard/preempt-rt/cn-sdkv6.1/octeon
>#Have textual conflicts
> 33d58f391255 v6.1/standard/microchip-polarfire-soc
> 7a324d693ac0 v6.1/standard/preempt-rt/microchip-polarfire-soc
>#Have textual conflicts
> fa81a6f5ee82 v6.1/standard/bcm-2xxx-rpi
> 7d18665d29dc v6.1/standard/preempt-rt/bcm-2xxx-rpi
>#Have textual conflicts
> 88714ab2b982 v6.1/standard/nxp-sdk-5.15/nxp-s32g
> f7261b4f1704 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
>#Have textual conflicts
> b3001ad2c0f0 v6.1/standard/intel-sdk-6.1/intel-socfpga
>#Have textual conflicts
> 23a0b1e792c8 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
>#Have textual conflicts
> 158fbc5639bd v6.1/standard/x86
> 6657024d2663 v6.1/standard/preempt-rt/x86
>#Have textual conflicts
> 64960db058fe v6.1/standard/sdkv6.1/xlnx-soc
> 6d72a43f8f44 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
>#Have textual conflicts
>
> - There is a conflict on the RT kernel, it was caused by following two
> commits:
> stable commit b8073c069a84 ("serial: Lock console when calling into
> driver before registration")
> RT commit 9c5c63877973 ("serial: 8250: implement write_atomic").
> This merge conflict is not too difficult to resolve.
>
> - There are many ugly merge conflicts in dwc3-am62 driver on j7xx branches
> due to the private data rename.
> aa1d1ce1ad6b ("usb: dwc3-am62: Rename private data")
> I believe I have resolved all of them.
>
> All the branches have passed my build test. I have pushed all these branches
> to:
> https://github.com/haokexin/linux
>
> You can use this as a reference for the linux-yocto stable kernel bump.
Thanks Kevin,
I did a smilar merge and grabbed your resolutions .. the ti-jxxx BSPs certainly
caused some issues :)
IF anything is still broken, ssend follow up patches.
Bruce
>
> Thanks,
> Kevin
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13782):
https://lists.yoctoproject.org/g/linux-yocto/message/13782
Mute This Topic: https://lists.yoctoproject.org/mt/105346373/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
