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.

----------------------------------------------------------------
Alexander Duyck (1):
      memory: Do not allow direct write access to rom_device regions

Bauerchen (1):
      oslib-posix: take lock before qemu_cond_broadcast

Bruce Rogers (1):
      module: increase dirs array size by one

Igor Mammedov (1):
      vl.c: error out if -mem-path is used together with -M memory-backend

Olaf Hering (1):
      piix: fix xenfv regression, add compat machine xenfv-4.2

Paolo Bonzini (3):
      atomics: convert to reStructuredText
      atomics: update documentation
      rcu: do not mention atomic_mb_read/set in 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 +-
 softmmu/vl.c                         |   5 +
 tests/qtest/device-introspect-test.c |   2 +-
 tests/qtest/qom-test.c               |  42 +--
 tests/qtest/test-hmp.c               |   2 +-
 util/module.c                        |   2 +-
 util/oslib-posix.c                   |   3 +
 13 files changed, 548 insertions(+), 448 deletions(-)
 create mode 100644 docs/devel/atomics.rst
 delete mode 100644 docs/devel/atomics.txt
-- 
2.18.2

On Sat, 11 Apr 2020 at 14:04, Paolo Bonzini <pbonzini@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

On Sat, 11 Apr 2020 09:03:22 -0400
Paolo Bonzini <pbonzini@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.
> 
> ----------------------------------------------------------------
> Alexander Duyck (1):
>       memory: Do not allow direct write access to rom_device regions
> 
> Bauerchen (1):
>       oslib-posix: take lock before qemu_cond_broadcast
> 
> Bruce Rogers (1):
>       module: increase dirs array size by one
> 
> Igor Mammedov (1):
>       vl.c: error out if -mem-path is used together with -M memory-backend

It seems one more patch was forgotten
 "[PATCH for-5.0 0/2] fix qemu crash with memory-backend-* prealloc=yes"


> 
> Olaf Hering (1):
>       piix: fix xenfv regression, add compat machine xenfv-4.2
> 
> Paolo Bonzini (3):
>       atomics: convert to reStructuredText
>       atomics: update documentation
>       rcu: do not mention atomic_mb_read/set in 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 +-
>  softmmu/vl.c                         |   5 +
>  tests/qtest/device-introspect-test.c |   2 +-
>  tests/qtest/qom-test.c               |  42 +--
>  tests/qtest/test-hmp.c               |   2 +-
>  util/module.c                        |   2 +-
>  util/oslib-posix.c                   |   3 +
>  13 files changed, 548 insertions(+), 448 deletions(-)
>  create mode 100644 docs/devel/atomics.rst
>  delete mode 100644 docs/devel/atomics.txt