On Sun, Aug 18, 2024 at 11:15:52PM -0400, Bruce Ashfield wrote: > > Surely this must also be needed on v5.15/standard/preempt-rt/base > as well ? The chnages look extraneous on it as well, since there's > no standard/base commit (or collection of commits) that matches > their content.
No, we shouldn't merge this into v5.15/standard/preempt-rt/base branch because it will also affect the v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc branch when we merge the v5.15/standard/preempt-rt/base into v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc in the future, and these changes shouldn't be applied to v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc branch. >If I leave them on v5.15/standard/preempt-rt/base > they risk being re-introduced later. No, that won't happen. Another option is that we merge this on the v5.15/standard/preempt-rt/base first, then merge v5.15/standard/preempt-rt/base into all the BSP's rt branches, but we would have to do a revert of that merge on the v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc separately. I will leave you to decide what merge policy to choose. Thanks, Kevin
signature.asc
Description: PGP signature
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14276): https://lists.yoctoproject.org/g/linux-yocto/message/14276 Mute This Topic: https://lists.yoctoproject.org/mt/107912289/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
