Hi,

$subject says all.  Finally merging this.  Wasn't clear which
maintainer/tree this should though, so I guess everybody hoped for
someone else picking it up, causing the series lingering on the list
for quite a while ...

It's docs, so it'll hardly cause regressions, merging into 2.9 even
though freeze deadline was yesterday should be fine.

please pull,
  Gerd

The following changes since commit e7c83a885f865128ae3cf1946f8cb538b63cbfba:

  vhost-user: delay vhost_user_stop (2017-02-28 19:11:15 +0000)

are available in the git repository at:

  git://git.kraxel.org/qemu tags/pull-docs-20170301-1

for you to fetch changes up to 166d434685ed6da5db88aca0c0599114e0c54462:

  mach-virt: Provide sample configuration files (2017-03-01 14:40:40 +0100)

----------------------------------------------------------------
docs: update sample configuration files

----------------------------------------------------------------
Andrea Bolognani (2):
      q35: Improve sample configuration files
      mach-virt: Provide sample configuration files

 docs/mach-virt-graphical.cfg  | 281 +++++++++++++++++++++++++++++++++++++++++
 docs/mach-virt-serial.cfg     | 243 +++++++++++++++++++++++++++++++++++
 docs/q35-chipset.cfg          | 152 ----------------------
 docs/q35-emulated.cfg         | 288 ++++++++++++++++++++++++++++++++++++++++++
 docs/q35-virtio-graphical.cfg | 248 ++++++++++++++++++++++++++++++++++++
 docs/q35-virtio-serial.cfg    | 193 ++++++++++++++++++++++++++++
 6 files changed, 1253 insertions(+), 152 deletions(-)
 create mode 100644 docs/mach-virt-graphical.cfg
 create mode 100644 docs/mach-virt-serial.cfg
 delete mode 100644 docs/q35-chipset.cfg
 create mode 100644 docs/q35-emulated.cfg
 create mode 100644 docs/q35-virtio-graphical.cfg
 create mode 100644 docs/q35-virtio-serial.cfg

On 1 March 2017 at 13:51, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> $subject says all.  Finally merging this.  Wasn't clear which
> maintainer/tree this should though, so I guess everybody hoped for
> someone else picking it up, causing the series lingering on the list
> for quite a while ...
>
> It's docs, so it'll hardly cause regressions, merging into 2.9 even
> though freeze deadline was yesterday should be fine.
>
> please pull,
>   Gerd
>
> The following changes since commit e7c83a885f865128ae3cf1946f8cb538b63cbfba:
>
>   vhost-user: delay vhost_user_stop (2017-02-28 19:11:15 +0000)
>
> are available in the git repository at:
>
>   git://git.kraxel.org/qemu tags/pull-docs-20170301-1
>
> for you to fetch changes up to 166d434685ed6da5db88aca0c0599114e0c54462:
>
>   mach-virt: Provide sample configuration files (2017-03-01 14:40:40 +0100)
>
> ----------------------------------------------------------------
> docs: update sample configuration files
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM