From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Roland Hieber <rhi@pengutronix.de>
Cc: barebox@lists.infradead.org, Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: Re: [PATCH] arch/arm/boards: Replace license and copyright boilerplate by SPDX identfiers
Date: Wed, 29 Apr 2020 15:41:56 +0200 [thread overview]
Message-ID: <20200429134156.heqow7sqyilgwgwp@pengutronix.de> (raw)
In-Reply-To: <20200429105044.pyc5gj343e2v4hgy@pengutronix.de>
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/beaglebone/board.c b/arch/arm/boards/beaglebone/board.c
> > index 819bdfae465a..661af7dbe0a1 100644
> > --- a/arch/arm/boards/beaglebone/board.c
> > +++ b/arch/arm/boards/beaglebone/board.c
> > @@ -1,20 +1,5 @@
> > -/*
> > - * (C) Copyright 2008
> > - * Texas Instruments, <www.ti.com>
> > - * Raghavendra KH <r-khandenahally@ti.com>
> > - *
> > - * Copyright (C) 2012 Jan Luebbe <j.luebbe@pengutronix.de>
> > - *
> > - * 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: © 2008 Raghavendra KH <r-khandenahally@ti.com>, Texas Instruments (http://www.ti.com/)
>
> SPDX-FileCopyrightText: © 2012 Jan Luebbe <j.luebbe@pengutronix.de>
> is missing
right, good catch.
> > 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@yandex.ru>
> > +
> > /*
> > - * Copyright (C) 2014 Andrey Panov <rockford@yandex.ru>
> > - *
> > * based on arch/arm/boards/freescale-mx6-sabresd/board.c
> > * Copyright (C) 2013 Hubert Feurstein <h.feurstein@gmail.com>
> > *
> > * 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@yandex.ru>
// SPDX-FileCopyrightText: © 2013 Hubert Feurstein <h.feurstein@gmail.com>
// 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
*/
?
> > diff --git a/arch/arm/boards/karo-tx6x/board.c b/arch/arm/boards/karo-tx6x/board.c
> > index 54b1e248f43d..f9d790b0f189 100644
> > --- a/arch/arm/boards/karo-tx6x/board.c
> > +++ b/arch/arm/boards/karo-tx6x/board.c
> > @@ -1,23 +1,13 @@
> > +// SPDX-License-Identifier: GPL-2.0-or-later
> > +// SPDX-FileCopyrightText: © 2014 Steffen Trumtrar, Pengutronix
> > +
> > +#define pr_fmt(fmt) "Karo-tx6: " fmt
> > +
> > /*
> > - * Copyright (C) 2014 Steffen Trumtrar, Pengutronix
> > - *
> > - *
> > * with the PMIC init code taken from u-boot
> > * Copyright (C) 2012,2013 Lothar Waßmann <LW@KARO-electronics.de>
>
> [..]
>
> > - *
> > - * 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.
> > */
> >
> > -#define pr_fmt(fmt) "Karo-tx6: " fmt
> > -
>
> Why does this line move to the top...?
huch, I guess I first removed the comment about u-boot and then readded
it during my own review at the wrong place. Will fix.
> > diff --git a/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.h b/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.h
> > index f6f89966970c..2a9477b8aa25 100644
> > --- a/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.h
> > +++ b/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.h
> > @@ -1,22 +1,11 @@
> > +// SPDX-License-Identifier: GPL-2.0-or-later
> > +// SPDX-FileCopyrightText: © 2008 Raghavendra KH <r-khandenahally@ti.com>,Texas Instruments (<www.ti.com>)
>
> You might want to add an additional space after the comma.
indeed. And also remove the < >.
> > 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@phytec.de>
> > - *
> > - * Copyright (C) 2006 Pengutronix
> > - * Sascha Hauer <s.hauer@pengutronix.de>
> > - * Robert Schwebel <r.schwebel@pengutronix.de>
> > - *
> > - * 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@phytec.de>, 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.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2020-04-29 13:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 13:24 Uwe Kleine-König
2020-04-29 10:50 ` Roland Hieber
2020-04-29 13:41 ` Uwe Kleine-König [this message]
2020-04-29 15:52 ` Roland Hieber
2020-05-23 15:00 ` Roland Hieber
2020-05-23 15:06 ` Roland Hieber
2020-05-25 20:42 ` Uwe Kleine-König
2020-05-19 16:37 Uwe Kleine-König
2020-05-19 19:49 ` Uwe Kleine-König
2020-07-01 19:56 ` Uwe Kleine-König
2020-05-25 5:54 ` Sascha Hauer
2020-05-25 20:34 ` Roland Hieber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200429134156.heqow7sqyilgwgwp@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=rhi@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox