Hi Thomas,
You might want to tweak this match a bit to include the prior
line, otherwise its going to look a bit weird after the patch is
applied. Specifically:
* This module:
- * This module 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.
Leaving a dangling "This module:" with nothing following will be a bit weird.
Kate
On Mon, May 20, 2019 at 12:10 PM Thomas Gleixner <tglx@xxxxxxxxxxxxx> wrote:
>
> Based on 1 normalized pattern(s):
>
> this module 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
>
> extracted by the scancode license scanner the SPDX license identifier
>
> GPL-2.0-or-later
>
> has been chosen to replace the boilerplate/reference in 18 file(s).
>
> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Cc: linux-spdx@xxxxxxxxxxxxxxx
>
> ---
> https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=batch2&id=7aa5fdf75240
> ---
> drivers/net/hamradio/bpqether.c | 5 +----
> drivers/net/wan/lapbether.c | 5 +----
> net/lapb/lapb_iface.c | 5 +----
> net/lapb/lapb_in.c | 5 +----
> net/lapb/lapb_out.c | 5 +----
> net/lapb/lapb_subr.c | 5 +----
> net/lapb/lapb_timer.c | 5 +----
> net/x25/af_x25.c | 5 +----
> net/x25/x25_dev.c | 5 +----
> net/x25/x25_facilities.c | 5 +----
> net/x25/x25_forward.c | 5 +----
> net/x25/x25_in.c | 5 +----
> net/x25/x25_link.c | 5 +----
> net/x25/x25_out.c | 5 +----
> net/x25/x25_proc.c | 5 +----
> net/x25/x25_route.c | 5 +----
> net/x25/x25_subr.c | 5 +----
> net/x25/x25_timer.c | 5 +----
> 18 files changed, 18 insertions(+), 72 deletions(-)
>
> --- a/drivers/net/hamradio/bpqether.c
> +++ b/drivers/net/hamradio/bpqether.c
> @@ -1,13 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * G8BPQ compatible "AX.25 via ethernet" driver release 004
> *
> * This code REQUIRES 2.0.0 or higher/ NET3.029
> *
> * This module:
> - * This module 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 is a "pseudo" network driver to allow AX.25 over Ethernet
> * using G8BPQ encapsulation. It has been extracted from the protocol
> --- a/drivers/net/wan/lapbether.c
> +++ b/drivers/net/wan/lapbether.c
> @@ -1,13 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * "LAPB via ethernet" driver release 001
> *
> * This code REQUIRES 2.1.15 or higher/ NET3.038
> *
> * This module:
> - * This module 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 is a "pseudo" network driver to allow LAPB over Ethernet.
> *
> --- a/net/lapb/lapb_iface.c
> +++ b/net/lapb/lapb_iface.c
> @@ -1,13 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * LAPB release 002
> *
> * This code REQUIRES 2.1.15 or higher/ NET3.038
> *
> * This module:
> - * This module 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.
> *
> * History
> * LAPB 001 Jonathan Naylor Started Coding
> --- a/net/lapb/lapb_in.c
> +++ b/net/lapb/lapb_in.c
> @@ -1,13 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * LAPB release 002
> *
> * This code REQUIRES 2.1.15 or higher/ NET3.038
> *
> * This module:
> - * This module 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.
> *
> * History
> * LAPB 001 Jonathan Naulor Started Coding
> --- a/net/lapb/lapb_out.c
> +++ b/net/lapb/lapb_out.c
> @@ -1,13 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * LAPB release 002
> *
> * This code REQUIRES 2.1.15 or higher/ NET3.038
> *
> * This module:
> - * This module 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.
> *
> * History
> * LAPB 001 Jonathan Naylor Started Coding
> --- a/net/lapb/lapb_subr.c
> +++ b/net/lapb/lapb_subr.c
> @@ -1,13 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * LAPB release 002
> *
> * This code REQUIRES 2.1.15 or higher/ NET3.038
> *
> * This module:
> - * This module 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.
> *
> * History
> * LAPB 001 Jonathan Naylor Started Coding
> --- a/net/lapb/lapb_timer.c
> +++ b/net/lapb/lapb_timer.c
> @@ -1,13 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * LAPB release 002
> *
> * This code REQUIRES 2.1.15 or higher/ NET3.038
> *
> * This module:
> - * This module 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.
> *
> * History
> * LAPB 001 Jonathan Naylor Started Coding
> --- a/net/x25/af_x25.c
> +++ b/net/x25/af_x25.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * X.25 Packet Layer release 002
> *
> @@ -8,10 +9,6 @@
> * This code REQUIRES 2.1.15 or higher
> *
> * This module:
> - * This module 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.
> *
> * History
> * X.25 001 Jonathan Naylor Started coding.
> --- a/net/x25/x25_dev.c
> +++ b/net/x25/x25_dev.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * X.25 Packet Layer release 002
> *
> @@ -7,10 +8,6 @@
> * This code REQUIRES 2.1.15 or higher
> *
> * This module:
> - * This module 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.
> *
> * History
> * X.25 001 Jonathan Naylor Started coding.
> --- a/net/x25/x25_facilities.c
> +++ b/net/x25/x25_facilities.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * X.25 Packet Layer release 002
> *
> @@ -8,10 +9,6 @@
> * This code REQUIRES 2.1.15 or higher
> *
> * This module:
> - * This module 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.
> *
> * History
> * X.25 001 Split from x25_subr.c
> --- a/net/x25/x25_forward.c
> +++ b/net/x25/x25_forward.c
> @@ -1,9 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * This module:
> - * This module 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.
> *
> * History
> * 03-01-2007 Added forwarding for x.25 Andrew Hendry
> --- a/net/x25/x25_in.c
> +++ b/net/x25/x25_in.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * X.25 Packet Layer release 002
> *
> @@ -8,10 +9,6 @@
> * This code REQUIRES 2.1.15 or higher
> *
> * This module:
> - * This module 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.
> *
> * History
> * X.25 001 Jonathan Naylor Started coding.
> --- a/net/x25/x25_link.c
> +++ b/net/x25/x25_link.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * X.25 Packet Layer release 002
> *
> @@ -8,10 +9,6 @@
> * This code REQUIRES 2.1.15 or higher
> *
> * This module:
> - * This module 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.
> *
> * History
> * X.25 001 Jonathan Naylor Started coding.
> --- a/net/x25/x25_out.c
> +++ b/net/x25/x25_out.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * X.25 Packet Layer release 002
> *
> @@ -8,10 +9,6 @@
> * This code REQUIRES 2.1.15 or higher
> *
> * This module:
> - * This module 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.
> *
> * History
> * X.25 001 Jonathan Naylor Started coding.
> --- a/net/x25/x25_proc.c
> +++ b/net/x25/x25_proc.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * X.25 Packet Layer release 002
> *
> @@ -8,10 +9,6 @@
> * This code REQUIRES 2.4 with seq_file support
> *
> * This module:
> - * This module 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.
> *
> * History
> * 2002/10/06 Arnaldo Carvalho de Melo seq_file support
> --- a/net/x25/x25_route.c
> +++ b/net/x25/x25_route.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * X.25 Packet Layer release 002
> *
> @@ -8,10 +9,6 @@
> * This code REQUIRES 2.1.15 or higher
> *
> * This module:
> - * This module 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.
> *
> * History
> * X.25 001 Jonathan Naylor Started coding.
> --- a/net/x25/x25_subr.c
> +++ b/net/x25/x25_subr.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * X.25 Packet Layer release 002
> *
> @@ -8,10 +9,6 @@
> * This code REQUIRES 2.1.15 or higher
> *
> * This module:
> - * This module 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.
> *
> * History
> * X.25 001 Jonathan Naylor Started coding.
> --- a/net/x25/x25_timer.c
> +++ b/net/x25/x25_timer.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * X.25 Packet Layer release 002
> *
> @@ -8,10 +9,6 @@
> * This code REQUIRES 2.1.15 or higher
> *
> * This module:
> - * This module 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.
> *
> * History
> * X.25 001 Jonathan Naylor Started coding.
>
>
>
>
