mbox

[PULL,trivial,0/5] trivial patches for 2013-07-19

Message ID 1374225073-12959-1-git-send-email-mjt@msgid.tls.msk.ru
State New
Headers show

Pull-request

git://git.corpit.ru/qemu.git trivial-patches

Message

Michael Tokarev July 19, 2013, 9:11 a.m. UTC
This is another trivial-patches pull request.  This time
we have just 5 patches accumulated in two (!) weeks period.
Please consider apply.

/mjt

The following changes since commit 24943978cbe79634a9a8b02a20efb25b29b3ab49:

  boot-order-test: Add tests for Sun4u (2013-07-18 13:27:47 -0500)

are available in the git repository at:

  git://git.corpit.ru/qemu.git trivial-patches

for you to fetch changes up to be022d61f4938bb051e8af8e6cb470ec1602c488:

  doc: monitor multiplexing rewording (2013-07-19 12:52:03 +0400)

----------------------------------------------------------------
Cole Robinson (1):
      Fix command example in qemu.sasl

Ed Maste (1):
      block/m25p80: Update Micron entries

Michael Tokarev (2):
      slirp: remove mbuf(m_hdr,m_dat) indirection
      doc: monitor multiplexing rewording

Petar Jovanovic (1):
      linux-user: declare sys_futex to have 6 arguments

 hw/block/m25p80.c |   12 ++++++++----
 linux-user/main.c |    2 +-
 qemu-options.hx   |    4 ++--
 qemu.sasl         |    2 +-
 slirp/mbuf.h      |   51 ++++++++++++++++++---------------------------------
 slirp/tcp_subr.c  |   12 ++++++------
 6 files changed, 36 insertions(+), 47 deletions(-)

Comments

Ed Maste July 24, 2013, 12:24 p.m. UTC | #1
On 19 July 2013 05:11, Michael Tokarev <mjt@tls.msk.ru> wrote:
> This is another trivial-patches pull request.  This time
> we have just 5 patches accumulated in two (!) weeks period.
> Please consider apply.
...
> Michael Tokarev (2):
>       slirp: remove mbuf(m_hdr,m_dat) indirection

Any idea when this might get pulled?  The FreeBSD build is broken
until this slirp fix makes it in.
Andreas Färber July 24, 2013, 1:28 p.m. UTC | #2
Am 24.07.2013 14:24, schrieb Ed Maste:
> On 19 July 2013 05:11, Michael Tokarev <mjt@tls.msk.ru> wrote:
>> This is another trivial-patches pull request.  This time
>> we have just 5 patches accumulated in two (!) weeks period.
>> Please consider apply.
> ...
>> Michael Tokarev (2):
>>       slirp: remove mbuf(m_hdr,m_dat) indirection
> 
> Any idea when this might get pulled?  The FreeBSD build is broken
> until this slirp fix makes it in.

What problem are you seeing? The pull is already merged apparently.

Andreas
Anthony Liguori July 24, 2013, 1:32 p.m. UTC | #3
Ed Maste <emaste@freebsd.org> writes:

> On 19 July 2013 05:11, Michael Tokarev <mjt@tls.msk.ru> wrote:
>> This is another trivial-patches pull request.  This time
>> we have just 5 patches accumulated in two (!) weeks period.
>> Please consider apply.
> ...
>> Michael Tokarev (2):
>>       slirp: remove mbuf(m_hdr,m_dat) indirection
>
> Any idea when this might get pulled?  The FreeBSD build is broken
> until this slirp fix makes it in.

Two days ago.

Regards,

Anthony Liguori
Ed Maste July 24, 2013, 1:58 p.m. UTC | #4
On 24 July 2013 09:32, Anthony Liguori <aliguori@us.ibm.com> wrote:
> Ed Maste <emaste@freebsd.org> writes:
>
>> On 19 July 2013 05:11, Michael Tokarev <mjt@tls.msk.ru> wrote:
>>> This is another trivial-patches pull request.  This time
>>> we have just 5 patches accumulated in two (!) weeks period.
>>> Please consider apply.
>> ...
>>> Michael Tokarev (2):
>>>       slirp: remove mbuf(m_hdr,m_dat) indirection
>>
>> Any idea when this might get pulled?  The FreeBSD build is broken
>> until this slirp fix makes it in.
>
> Two days ago.

Ahh, sorry - I was somehow pulling from a local mirror that got stuck.