[Qemu-devel] [PULL 0/2] slirp updates: MIN/MAX, tftp dynamic blocks

[Samuel Thibault]

The following changes since commit 82ecffa8c050bf5bbc13329e9b65eac1caa5b55c:

  Open 2.9 development tree (2016-12-20 16:20:16 +0000)

are available in the git repository at:

  http://people.debian.org/~sthibault/qemu.git tags/samuel-thibault

for you to fetch changes up to 9443598d7e2f2c0a6493d97b3f11dd04837b08e8:

  slirp: support dynamic block size for TFTP transfers (2016-12-21 00:02:15 
+0100)

----------------------------------------------------------------
slirp updates

----------------------------------------------------------------
Hervé Poussineau (1):
      slirp: support dynamic block size for TFTP transfers

Yuval Shaia (1):
      slirp, disas: Replace min/max with MIN/MAX macros

 disas/m68k.c       |  8 ++------
 slirp/dhcpv6.c     |  2 +-
 slirp/ip6_icmp.c   |  2 +-
 slirp/slirp.c      |  2 +-
 slirp/slirp.h      |  5 -----
 slirp/tcp_input.c  | 16 ++++++++--------
 slirp/tcp_output.c |  6 +++---
 slirp/tcp_timer.c  |  2 +-
 slirp/tcpip.h      |  2 +-
 slirp/tftp.c       | 26 ++++++++++++++------------
 slirp/tftp.h       |  8 +++++---
 11 files changed, 37 insertions(+), 42 deletions(-)