From 59f92965b90efc00b0cb63e3d4edfefd9b24326f Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 10 Jul 2019 13:18:10 +0200 Subject: [PATCH] Relicense GPL-2.0-or-later files to GPL-2.0-only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This way all licenses in the project will be homogenised. Acked-by: Marc Kleine-Budde Acked-by: Oliver Hartkopp Acked-by: Sven Schmitt Acked-by: Oleksij Rempel Acked-by: Uwe Kleine-König Acked-by: Brennan Ashton Acked-By: IOhannes m zmölnig Acked-by: Frank Theile Acked-by: Wolfgang Grandegger Acked-by: Jeremiah Mahler Acked-by: Jonathan Challinger Acked-by: Cheng-Lung Lee Acked-by: Ramesh Shanmugasundaram Acked-by: Mans Rullgard Acked-by: Søren Holm Signed-off-by: Yegor Yefremov --- can-calc-bit-timing.c | 7 +++---- canfdtest.c | 7 +++---- jcat.c | 2 +- slcand.c | 7 +++---- slcanpty.c | 7 +++---- 5 files changed, 13 insertions(+), 17 deletions(-) diff --git a/can-calc-bit-timing.c b/can-calc-bit-timing.c index 29ceb2a..abbc4ca 100644 --- a/can-calc-bit-timing.c +++ b/can-calc-bit-timing.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* can-calc-bit-timing.c: Calculate CAN bit timing parameters * * Copyright (C) 2008 Wolfgang Grandegger @@ -12,9 +12,8 @@ * email:pisa@cmp.felk.cvut.cz * * 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 - * any later version. + * it under the terms of the version 2 of the GNU General Public License + * as published by the Free Software Foundation */ #include diff --git a/canfdtest.c b/canfdtest.c index bc82015..cf59a3a 100644 --- a/canfdtest.c +++ b/canfdtest.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * canfdtest.c - Full-duplex test program (DUT and host part) * @@ -6,9 +6,8 @@ * (C) 2009 Wolfgang Grandegger * * 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 - * any later version. + * it under the terms of the version 2 of the GNU General Public License + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/jcat.c b/jcat.c index f4a0765..037b6a3 100644 --- a/jcat.c +++ b/jcat.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0-or-later +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2018 Pengutronix, Oleksij Rempel */ diff --git a/slcand.c b/slcand.c index 7468169..3c8c755 100644 --- a/slcand.c +++ b/slcand.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * slcand.c - userspace daemon for serial line CAN interface driver SLCAN * @@ -6,9 +6,8 @@ * Copyright (c) 2009 Verari Systems Inc. * * 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. + * it under the terms of the version 2 of the GNU General Public License + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/slcanpty.c b/slcanpty.c index 297810f..e90b32a 100644 --- a/slcanpty.c +++ b/slcanpty.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * slcanpty.c - creates a pty for applications using the slcan ASCII protocol * and converts the ASCII data to a CAN network interface (and vice versa) @@ -6,9 +6,8 @@ * Copyright (c)2009 Oliver Hartkopp * * 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. + * it under the terms of the version 2 of the GNU General Public License + * as published by the Free Software Foundation * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of