In message: [linux-yocto]: [kernel/kernel-rt v6.1]: add kernel patches for NXP ls1043ardb/ls1046ardb platform on 02/06/2023 Meng Li wrote:
> From: Limeng <[email protected]> > > Hi Bruce, > > The 9 patches are for NXP ls1043ardb/ls1046ardb platform, and I want to merge > them into linux-yocto. It looks like there are more than 9 patches from the summary below. I was able to fetch and merge to v6.1/standard/nxp-sdk-6.1/nxp-soc, but the preempt-rt version has conflicts due to the baseline of the branch you provided. That being said, I dumped the 14 patches from the summary below and manually merged them to the preempt-rt branch. If anything is wrong, send follow up patches. Bruce > So, could you please help merge these patches 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? > The 14 patches are in my public repo > https://github.com/limeng-linux/linux-yocto-6.1.git > v6.1/standard/nxp-sdk-6.1/nxp-soc > > > diffstat info as below: > > arch/arm64/boot/dts/freescale/Makefile | 2 > arch/arm64/boot/dts/freescale/fsl-ls1023a-rdb-sdk.dts | 40 > +++++++++ > arch/arm64/boot/dts/freescale/fsl-ls1023a-rdb-usdpaa.dts | 40 > +++++++++ > arch/arm64/boot/dts/freescale/fsl-ls1026a-rdb-sdk.dts | 40 > +++++++++ > arch/arm64/boot/dts/freescale/fsl-ls1026a-rdb-usdpaa.dts | 40 > +++++++++ > arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 1 > arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 2 > drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 3 > drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.c | 3 > drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_common.c | 41 > +++++++++- > drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_common.h | 3 > drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c | 4 > drivers/net/ethernet/freescale/sdk_dpaa/mac-api.c | 3 > drivers/net/ethernet/freescale/sdk_dpaa/mac.c | 2 > drivers/net/ethernet/freescale/sdk_fman/Peripherals/FM/Port/fm_port.c | 8 > - > drivers/net/ethernet/freescale/sdk_fman/src/wrapper/lnxwrp_fm.c | 22 > +++++ > drivers/net/ethernet/freescale/sdk_fman/src/xx/xx_arm_linux.c | 3 > drivers/staging/fsl_qbman/dpa_alloc.c | 15 > ++- > drivers/staging/fsl_qbman/qman_high.c | 19 > +++- > 19 files changed, 268 insertions(+), 23 deletions(-) > > > Pull request info as below: > > The following changes since commit 763ac07dd98b3dc2423aa279bd382e456112ef6f: > > Merge branch 'v6.1/standard/base' into v6.1/standard/nxp-sdk-6.1/nxp-soc > (2023-05-31 19:35:16 -0400) > > are available in the Git repository at: > > https://github.com/limeng-linux/linux-yocto-6.1.git > v6.1/standard/nxp-sdk-6.1/nxp-soc > > for you to fetch changes up to 7c9ecab856835cefef51c11a0322089fe81a85a7: > > driver: net: dpaa: release resource when executing kexec (2023-06-02 > 01:38:34 -0400) > > ---------------------------------------------------------------- > Meng Li (12): > driver: net: dpaa: improve the assignment operation for context cache > line > arch: arm64: dts: add dts files for nxp-ls1023 platform > arch: arm64: dts: disable sec_jr2 dts node > drvier: staging: fsl_qbman: move used_node variable allocation out the > lock/unlock section > drvier: dpaa: Convert the rx_pool_channel_init from spinlock to mutex > driver: sdk_fman: remove the disable interrupt action in xx_Malloc() > driver: staging: fsl_qbman: avoid preempt disable action by invoking > this_cpu_ptr() in rt kernel > driver: staging: fsl_qbman: improve PORTAL_IRQ_LOCK/UNLOCK() with local > lock interface > arch: arm64: dts: add dts files for nxp-ls1026 platform > arch: arm64: dts: set correct phy-connection-type for aqr107 10G phy > driver: net: dpaa: support interface mode usxgmii > driver: net: dpaa: release resource when executing kexec > > Tiejun Chen (1): > dpaa: make sure FM_PORT_Free work reasonably > > Zumeng Chen (1): > dpaa_ethernet: fix kmemleak false-positive reports for skb > > arch/arm64/boot/dts/freescale/Makefile | 2 ++ > arch/arm64/boot/dts/freescale/fsl-ls1023a-rdb-sdk.dts | 40 > ++++++++++++++++++++++++++++++++++++++++ > arch/arm64/boot/dts/freescale/fsl-ls1023a-rdb-usdpaa.dts | 40 > ++++++++++++++++++++++++++++++++++++++++ > arch/arm64/boot/dts/freescale/fsl-ls1026a-rdb-sdk.dts | 40 > ++++++++++++++++++++++++++++++++++++++++ > arch/arm64/boot/dts/freescale/fsl-ls1026a-rdb-usdpaa.dts | 40 > ++++++++++++++++++++++++++++++++++++++++ > arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 1 + > arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 2 +- > drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 3 > ++- > drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.c | 3 > +++ > drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_common.c | 41 > +++++++++++++++++++++++++++++++++++++---- > drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_common.h | 3 > +++ > drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c | 4 > ++++ > drivers/net/ethernet/freescale/sdk_dpaa/mac-api.c | 3 > ++- > drivers/net/ethernet/freescale/sdk_dpaa/mac.c | 2 ++ > drivers/net/ethernet/freescale/sdk_fman/Peripherals/FM/Port/fm_port.c | 8 > ++++---- > drivers/net/ethernet/freescale/sdk_fman/src/wrapper/lnxwrp_fm.c | 22 > ++++++++++++++++++++++ > drivers/net/ethernet/freescale/sdk_fman/src/xx/xx_arm_linux.c | 3 > --- > drivers/staging/fsl_qbman/dpa_alloc.c | 15 > +++++++++------ > drivers/staging/fsl_qbman/qman_high.c | 19 > ++++++++++++++++--- > 19 files changed, 268 insertions(+), 23 deletions(-) > create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1023a-rdb-sdk.dts > create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1023a-rdb-usdpaa.dts > create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1026a-rdb-sdk.dts > create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1026a-rdb-usdpaa.dts > mode change 100755 => 100644 > drivers/net/ethernet/freescale/sdk_fman/src/wrapper/lnxwrp_fm.c > > > thanks, > Limeng
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12694): https://lists.yoctoproject.org/g/linux-yocto/message/12694 Mute This Topic: https://lists.yoctoproject.org/mt/99281006/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
