On 3/14/19 8:10 AM, Marc-André Lureau wrote: > The slirp COPYRIGHT file is a BSD-3 license. Instead of referring to > another project file, the SPDX license notice present in all source > files states that unequivocally. > > Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> > ---
Perhaps parts could be squashed in with 5/8? Hmm, comparing the file list between 5/8 and this one: > slirp/src/debug.h | 3 --- > slirp/src/if.h | 3 --- > slirp/src/main.h | 3 --- > slirp/src/misc.h | 3 --- > slirp/src/sbuf.h | 3 --- > slirp/src/socket.h | 3 --- > slirp/src/if.c | 3 --- these match, > slirp/src/ip_input.c | 3 --- > slirp/src/ip_output.c | 3 --- these two were in 3/8 instead? Oh, I see - the files in 5/8 mention ONLY the COPYRIGHT file, while the files touched here and in 3/8 mention BOTH an explicit BSD and the COPYRIGHT file. Okay, I'm sold, don't squash this one in to either 3/8 or 5/8. > slirp/src/mbuf.c | 3 --- > slirp/src/misc.c | 3 --- > slirp/src/sbuf.c | 3 --- > slirp/src/socket.c | 3 --- more from 5/8 > slirp/src/tcp_input.c | 3 --- > slirp/src/tcp_output.c | 3 --- > slirp/src/tcp_subr.c | 3 --- more from 3/8 > +++ b/slirp/src/tcp_input.c > @@ -34,9 +34,6 @@ > /* > * Changes and additions relating to SLiRP Side question - what is the history behind this choice of capitalization? Should we pick a more consistent spelling and stick to it, whether 'slirp', 'SLiRP', or 'SLIRP'? But not for this series. Reviewed-by: Eric Blake <ebl...@redhat.com> -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
