On Wed, Apr 29, 2020 at 03:41:56PM +0200, Uwe Kleine-König wrote: > Hallo Roland, > > first of all thanks for your feedback. > > On Wed, Apr 29, 2020 at 12:50:45PM +0200, Roland Hieber wrote: > > On Tue, Apr 28, 2020 at 03:24:05PM +0200, Uwe Kleine-König wrote: > > > diff --git a/arch/arm/boards/embedsky-e9/board.c b/arch/arm/boards/embedsky-e9/board.c > > > index e5f92636fbc3..e86d1700376b 100644 > > > --- a/arch/arm/boards/embedsky-e9/board.c > > > +++ b/arch/arm/boards/embedsky-e9/board.c > > > @@ -1,21 +1,12 @@ > > > +// SPDX-License-Identifier: GPL-2.0-or-later > > > +// SPDX-FileCopyrightText: © 2014 Andrey Panov <rockford@xxxxxxxxx> > > > + > > > /* > > > - * Copyright (C) 2014 Andrey Panov <rockford@xxxxxxxxx> > > > - * > > > * based on arch/arm/boards/freescale-mx6-sabresd/board.c > > > * Copyright (C) 2013 Hubert Feurstein <h.feurstein@xxxxxxxxx> > > > * > > > * based on arch/arm/boards/freescale-mx6-sabrelite/board.c > > > * Copyright (C) 2012 Steffen Trumtrar, Pengutronix > > > > This looks like SPDX-FileCopyrightText to me too? > > I'm unsure (and didn't add SPDX-FileCopyrightText consistently for these > (I hope)). Is the copyright "infecting" in this way? What is your > suggestion? > > // SPDX-License-Identifier: GPL-2.0-or-later > // SPDX-FileCopyrightText: © 2014 Andrey Panov <rockford@xxxxxxxxx> > // SPDX-FileCopyrightText: © 2013 Hubert Feurstein <h.feurstein@xxxxxxxxx> > // SPDX-FileCopyrightText: © 2012 Steffen Trumtrar, Pengutronix > > /* > * based on arch/arm/boards/freescale-mx6-sabresd/board.c > * and arch/arm/boards/freescale-mx6-sabrelite/board.c > */ > > ? Yes. "based on" suggests to me "I copied the file and adapted it", so the copyright lines from the copied file probably still apply – at least I would count on it until we can disprove it (which we probably won't). Further down in your patch we also had an "inspired by", but I don't think that language is strong enough to warrant a copyright line. > > > diff --git a/arch/arm/boards/phytec-phycore-pxa270/config.h b/arch/arm/boards/phytec-phycore-pxa270/config.h > > > index ca02b1140b27..325c40191329 100644 > > > --- a/arch/arm/boards/phytec-phycore-pxa270/config.h > > > +++ b/arch/arm/boards/phytec-phycore-pxa270/config.h > > > @@ -1,23 +1,7 @@ > > > -/* > > > - * Copyright (C) 2005 Phytec Messtechnik GmbH > > > - * Juergen Kilb, H. Klaholz <armlinux@xxxxxxxxx> > > > - * > > > - * Copyright (C) 2006 Pengutronix > > > - * Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> > > > - * Robert Schwebel <r.schwebel@xxxxxxxxxxxxxx> > > > - * > > > - * This program is free software; you can redistribute it and/or > > > - * modify it under the terms of the GNU General Public License as > > > - * published by the Free Software Foundation; either version 2 of > > > - * the License, or (at your option) any later version. > > > - * > > > - * This program is distributed in the hope that it will be useful, > > > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > > > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > > - * GNU General Public License for more details. > > > - * > > > - * > > > - */ > > > +// SPDX-License-Identifier: GPL-2.0-or-later > > > +// SPDX-FileCopyrightText: © 2005 Juergen Kilb & H. Klaholz <armlinux@xxxxxxxxx>, Phytec Messtechnik GmbH > > > > Nitpick: an '&' might have a slightly different semantics as a ','. > > Right, I didn't use a , as the email address looked as if it covered > both persons. An alternative I considered is to use two lines for the > two developpers and duplicate the email address. I don't like s/&/,/ as > after a name and a comma in all other locations a company only follows. Yeah, I don't have a favourite here either. - Roland -- Roland Hieber, Pengutronix e.K. | r.hieber@xxxxxxxxxxxxxx | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
