The following changes since commit a2e002ff7913ce93aa0f7dbedd2123dce5f1a9cd:

  Merge remote-tracking branch 'remotes/vivier2/tags/qemu-trivial-for-3.1-pull-request' into staging (2018-10-30 15:49:55 +0000)

are available in the Git repository at:

  https://github.com/elmarco/qemu.git tags/chrdev-pull-request

for you to fetch changes up to 1ad723e98b8499d0690f7f7eafc945908a1db634:

  editorconfig: set emacs mode (2018-11-01 12:13:12 +0400)

----------------------------------------------------------------
- add websocket support
- socket: make 'fd' incompatible with 'reconnect'
- fix a websocket leak
- unrelated editorconfig patch that missed -trivial (included for
  convenience)
- v2: fix commit author field

----------------------------------------------------------------

Julia Suvorova (3):
  chardev/char-socket: Function headers refactoring
  chardev: Add websocket support
  tests/test-char: Check websocket chardev functionality

Marc-André Lureau (4):
  websock: fix handshake leak
  char-socket: correctly set has_reconnect when parsing QemuOpts
  char-socket: make 'fd' incompatible with 'reconnect'
  editorconfig: set emacs mode

 qapi/char.json        |   3 +
 chardev/char-socket.c | 123 ++++++++++++++++++++++++++++++-----------
 chardev/char.c        |   8 ++-
 io/channel-websock.c  |   1 +
 tests/test-char.c     | 125 ++++++++++++++++++++++++++++++++++++++++++
 .editorconfig         |  21 ++++++-
 qemu-options.hx       |  13 ++++-
 7 files changed, 257 insertions(+), 37 deletions(-)

-- 
2.19.1.708.g4ede3d42df

On 1 November 2018 at 08:24, Marc-André Lureau
<marcandre.lureau@redhat.com> wrote:
> The following changes since commit a2e002ff7913ce93aa0f7dbedd2123dce5f1a9cd:
>
>   Merge remote-tracking branch 'remotes/vivier2/tags/qemu-trivial-for-3.1-pull-request' into staging (2018-10-30 15:49:55 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/elmarco/qemu.git tags/chrdev-pull-request
>
> for you to fetch changes up to 1ad723e98b8499d0690f7f7eafc945908a1db634:
>
>   editorconfig: set emacs mode (2018-11-01 12:13:12 +0400)
>
> ----------------------------------------------------------------
> - add websocket support
> - socket: make 'fd' incompatible with 'reconnect'
> - fix a websocket leak
> - unrelated editorconfig patch that missed -trivial (included for
>   convenience)
> - v2: fix commit author field
>
> ----------------------------------------------------------------
Applied, thanks.

-- PMM