On Sat, 11 Apr 2020 at 14:04, Paolo Bonzini <pbonz...@redhat.com> wrote: > > The following changes since commit 53ef8a92eb04ee19640f5aad3bff36cd4a36c250: > > Merge remote-tracking branch > 'remotes/pmaydell/tags/pull-target-arm-20200406' into staging (2020-04-06 > 12:36:45 +0100) > > are available in the Git repository at: > > git://github.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 8c12bd8e32faf8c483cd96c1557899120bc67eea: > > module: increase dirs array size by one (2020-04-11 08:49:26 -0400) > > ---------------------------------------------------------------- > Bugfixes, and reworking of the atomics documentation. >
> > docs/devel/atomics.rst | 507 > +++++++++++++++++++++++++++++++++++ > docs/devel/atomics.txt | 403 ---------------------------- > docs/devel/index.rst | 1 + > docs/devel/rcu.txt | 4 +- > hw/i386/pc_piix.c | 19 +- > include/exec/memory.h | 4 +- > roms/SLOF | 2 +- It looks like this roms/SLOF change is bogus (it's in your "atomics: update documentation" commit) and it makes git complain about the merge attempt: Failed to merge submodule roms/SLOF (commits don't follow merge-base) Auto-merging roms/SLOF CONFLICT (submodule): Merge conflict in roms/SLOF Removing docs/devel/atomics.txt Automatic merge failed; fix conflicts and then commit the result. thanks -- PMM