RTEMS | bsp: Merge conflicts (ba3f0f91)

[Heinz Junkes (@junkes)]

Heinz Junkes commented: https://gitlab.rtems.org/rtems/rtos/rtems/-/commit/ba3f0f917e274e5b1378c1851ee3425335ca905f#note_130963


This is what I did:
https://gitlab.rtems.org/junkes/rtems/-/commit/260e469dd9f205fb16acdadd9392dd25a114c076

However, I am concerned that I may have lost 'contact' with this merge request?
Should I create a new one and use a 'feature branch' as suggested?

-- 
View it on GitLab: https://gitlab.rtems.org/rtems/rtos/rtems/-/commit/ba3f0f917e274e5b1378c1851ee3425335ca905f#note_130963
You're receiving this email because of your account on gitlab.rtems.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/bugs/attachments/20250916/735f4ea6/attachment.htm>