On Mon, 29 Jun 2026 at 07:26, Auto Upgrade Helper via lists.openembedded.org <[email protected]> wrote: > INFO: Rebasing devtool onto d3db82c7a44140ac4e5d4d7a6b7a194cd95d151d > WARNING: Command 'git rebase d3db82c7a44140ac4e5d4d7a6b7a194cd95d151d' failed: > Auto-merging Makefile.in > CONFLICT (content): Merge conflict in Makefile.in > Auto-merging configure.ac > CONFLICT (content): Merge conflict in configure.ac > Auto-merging include/compiler.h > CONFLICT (content): Merge conflict in include/compiler.h
This update needs a non-trivial rebase of the patches that add debug-prefix-map option. I've asked Joshua to do that in the upstream submission: https://github.com/netwide-assembler/nasm/pull/8 Alex
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#239825): https://lists.openembedded.org/g/openembedded-core/message/239825 Mute This Topic: https://lists.openembedded.org/mt/120026340/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
