The following changes since commit d97a39d903fe33c45be83ac6943a2f82a3649a11:

  Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging (2019-03-22 09:37:38 +0000)

are available in the Git repository at:

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

for you to fetch changes up to 7849f0c2ecf35f04c8dfcea30f675182cafdd455:

  slirp: is not maintained by Kelly Price for a long time (2019-03-22 17:31:42 +0100)

----------------------------------------------------------------
slirp: clarify license of slirp as BSD-3

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

Marc-André Lureau (8):
  slirp: update COPYRIGHT to use full 3-Clause BSD License
  slirp: relicense GPL files to BSD-3
  slirp: clarify license of slirp files using SPDX: explicit BSD
  slirp: clarify license of slirp files using SPDX: explicit MIT
  slirp: clarify license of slirp files using SPDX: implicit via
    COPYRIGHT
  slirp: clarify license of slirp files using SPDX: implicit via
    unstated
  slirp: remove reference to COPYRIGHT file
  slirp: is not maintained by Kelly Price for a long time

 slirp/src/bootp.h      |  1 +
 slirp/src/debug.h      |  4 +---
 slirp/src/dhcpv6.h     | 32 +++++++++++++++++++++++++++++--
 slirp/src/if.h         |  4 +---
 slirp/src/ip.h         |  1 +
 slirp/src/ip6.h        |  1 +
 slirp/src/ip6_icmp.h   |  1 +
 slirp/src/ip_icmp.h    |  1 +
 slirp/src/libslirp.h   |  1 +
 slirp/src/main.h       |  4 +---
 slirp/src/mbuf.h       |  1 +
 slirp/src/misc.h       |  4 +---
 slirp/src/ncsi-pkt.h   | 34 +++++++++++++++++++++++++++++----
 slirp/src/qtailq.h     |  1 +
 slirp/src/sbuf.h       |  4 +---
 slirp/src/slirp.h      |  1 +
 slirp/src/socket.h     |  4 +---
 slirp/src/stream.h     |  1 +
 slirp/src/tcp.h        |  1 +
 slirp/src/tcp_timer.h  |  1 +
 slirp/src/tcp_var.h    |  1 +
 slirp/src/tcpip.h      |  1 +
 slirp/src/tftp.h       |  1 +
 slirp/src/udp.h        |  1 +
 slirp/src/util.h       |  1 +
 slirp/src/vmstate.h    | 43 +++++++++++++++++++++++++++---------------
 slirp/src/arp_table.c  |  1 +
 slirp/src/bootp.c      |  1 +
 slirp/src/cksum.c      |  1 +
 slirp/src/dhcpv6.c     | 38 +++++++++++++++++++++++++++----------
 slirp/src/dnssearch.c  |  1 +
 slirp/src/if.c         |  4 +---
 slirp/src/ip6_icmp.c   |  1 +
 slirp/src/ip6_input.c  |  1 +
 slirp/src/ip6_output.c |  1 +
 slirp/src/ip_icmp.c    |  1 +
 slirp/src/ip_input.c   |  4 +---
 slirp/src/ip_output.c  |  4 +---
 slirp/src/mbuf.c       |  4 +---
 slirp/src/misc.c       |  4 +---
 slirp/src/ncsi.c       | 32 +++++++++++++++++++++++++++++--
 slirp/src/ndp_table.c  |  1 +
 slirp/src/sbuf.c       |  4 +---
 slirp/src/slirp.c      |  1 +
 slirp/src/socket.c     |  4 +---
 slirp/src/state.c      |  1 +
 slirp/src/stream.c     |  1 +
 slirp/src/tcp_input.c  |  4 +---
 slirp/src/tcp_output.c |  4 +---
 slirp/src/tcp_subr.c   |  4 +---
 slirp/src/tcp_timer.c  |  1 +
 slirp/src/tftp.c       |  1 +
 slirp/src/udp.c        |  1 +
 slirp/src/udp6.c       |  1 +
 slirp/src/util.c       |  1 +
 slirp/src/vmstate.c    | 32 +++++++++++++++++++++++++++++--
 slirp/COPYRIGHT        |  5 +++--
 57 files changed, 229 insertions(+), 85 deletions(-)

-- 
2.21.0.4.g36eb1cb9cf

On Fri, 22 Mar 2019 at 19:17, Marc-André Lureau
<marcandre.lureau@redhat.com> wrote:
>
> The following changes since commit d97a39d903fe33c45be83ac6943a2f82a3649a11:
>
>   Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging (2019-03-22 09:37:38 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/elmarco/qemu.git tags/slirp-pull-request
>
> for you to fetch changes up to 7849f0c2ecf35f04c8dfcea30f675182cafdd455:
>
>   slirp: is not maintained by Kelly Price for a long time (2019-03-22 17:31:42 +0100)
>
> ----------------------------------------------------------------
> slirp: clarify license of slirp as BSD-3
>

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.0
for any user-visible changes.

-- PMM