xiaoxiang781216 commented on PR #21951: URL: https://github.com/apache/nuttx/pull/21951#issuecomment-6954859444
> > > As we all agreed, I would request to retain your changes the Native or iLLD PR gets merged, otherwise it creates unnecessary conflict problem and last PR especially breaks the compilation on master. > > > > > > My understanding is that we should submit our work on a module-by-module basis. Since you have already merged the 'trap' and 'irq' modules, I will build upon that; if there are any further changes to these modules on your end, please submit them. > > Given our limited time, we cannot wait for everything to be merged. As I see it, our respective changes are in different areas, so there shouldn't be many conflicts. > > As long as the changes never conflicts we can move on, but changes are directly creates unnecessary conflicts on my PR and taking further delay. > > [cf4705a](https://github.com/apache/nuttx/commit/cf4705a6da7669c7bd11faf266efb1daef899350) commit on this PR is duplicate effort of #21940, I reported the current upstream is broken (build failure) and created PR added you as review. Instead of review, the changes duplicated in this PR without any information of build failure or fixes on PR description. @zhangyu-duck please fix the conflict, https://github.com/apache/nuttx/commit/cf4705a6da7669c7bd11faf266efb1daef899350 is merged. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
