Hello,
Should this go through my tree, or perhaps it can be directly pushed to
master by Peter since it's no-code-only-copyright changes?
Samuel
Marc-André Lureau, le jeu. 14 mars 2019 14:10:41 +0100, a ecrit:
> In order to make slirp a standalone project, the project must have a
> clear license, and be compatible with the GPL or LGPL.
>
> Since commit 2f5f89963186d42a7ded253bc6cf5b32abb45cec ("Remove the
> advertising clause from the slirp license"), slirp is BSD-3. But new
> files have been added under slirp/ with QEMU GPL license since then.
>
> v3:
> - add preliminary "slirp: update COPYRIGHT to use full 3-Clause BSD
> License"
> - split "slirp: clarify license of slirp files using SPDX" patch,
> - fix SPDX for files with MIT license header
> - add r-b tags, wording/spelling changes
>
> v2:
> - split the initial patch to add BSD-3 header & then SPDX lines
> - do not modify existing copyright headers without copyright holder
> authorization
> - drop the weak/ambiguous notice to the COPYRIGHT file
> - added a RFC patch to remove Kelly Price from the maintainer duties
>
> 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
> slirp: clarify license of slirp files using SPDX
> slirp: clarify license of slirp files using SPDX
> slirp: clarify license of slirp files using SPDX
> 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
>
--
Samuel
As usual, this being a 1.3.x release, I haven't even compiled this
kernel yet. So if it works, you should be doubly impressed.
(Linus Torvalds, announcing kernel 1.3.3 on the linux-kernel mailing list.)