On Mon, Aug 19, 2024 at 12:01:07AM -0400, Bruce Ashfield wrote: > It isn't quite that simple. > > There's a merge conflict with those branches due to the fixup > change being in preempt-rt/base, so I can't simply revert the > merge commit as it contains other changes. > > I can always do a -Xours merge to the BSP branch to get most > everything correct, and you could send a fixup for those > two BSP branches. > > Would that work ?
Yes, that should work well. Thanks, Kevin
signature.asc
Description: PGP signature
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14280): https://lists.yoctoproject.org/g/linux-yocto/message/14280 Mute This Topic: https://lists.yoctoproject.org/mt/107912365/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
