Reviewed-by: Kate Stewart <kstewart@xxxxxxxxxxxxxxxxxxx> On Fri, May 24, 2019 at 5:12 AM Thomas Gleixner <tglx@xxxxxxxxxxxxx> wrote: > > From: Thomas Gleixner tglx@xxxxxxxxxxxxx > > Based on 1 normalized pattern(s): > > 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 you should have received a copy > of the gnu general public license along with this program if not write to > the free software foundation inc 675 mass ave cambridge ma 02139 usa > > extracted by the scancode license scanner the SPDX license identifier > > GPL-2.0-or-later > > has been chosen to replace the boilerplate/reference in 4 file(s). > > Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > > --- > https://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-spdx.git/commit/?h=batch6&id=a4caace4c70b > --- > net/dccp/ccids/ccid3.c | 15 +-------------- > net/dccp/ccids/ccid3.h | 15 +-------------- > net/dccp/ccids/lib/packet_history.c | 15 +-------------- > net/dccp/ccids/lib/packet_history.h | 15 +-------------- > 4 files changed, 4 insertions(+), 56 deletions(-) > > --- a/net/dccp/ccids/ccid3.c > +++ b/net/dccp/ccids/ccid3.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2007 The University of Aberdeen, Scotland, UK > * Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand. > @@ -17,20 +18,6 @@ > * Arnaldo Carvalho de Melo <acme@xxxxxxxxxxxxxxxx>. > * > * Copyright (c) 2005 Arnaldo Carvalho de Melo <acme@xxxxxxxxxxxxxxxx> > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * along with this program; if not, write to the Free Software > - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > #include "../dccp.h" > #include "ccid3.h" > --- a/net/dccp/ccids/ccid3.h > +++ b/net/dccp/ccids/ccid3.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand. > * Copyright (c) 2007 The University of Aberdeen, Scotland, UK > @@ -17,20 +18,6 @@ > * Arnaldo Carvalho de Melo <acme@xxxxxxxxxxxxxxxx>. > * > * Copyright (c) 2005 Arnaldo Carvalho de Melo <acme@xxxxxxxxxxxxxxxx> > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * along with this program; if not, write to the Free Software > - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > #ifndef _DCCP_CCID3_H_ > #define _DCCP_CCID3_H_ > --- a/net/dccp/ccids/lib/packet_history.c > +++ b/net/dccp/ccids/lib/packet_history.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > /* > * Copyright (c) 2007 The University of Aberdeen, Scotland, UK > * Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand. > @@ -17,20 +18,6 @@ > * Arnaldo Carvalho de Melo <acme@xxxxxxxxxxxxxxxx>. > * > * Copyright (c) 2005 Arnaldo Carvalho de Melo <acme@xxxxxxxxxxxxxxxx> > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * along with this program; if not, write to the Free Software > - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > #include <linux/string.h> > --- a/net/dccp/ccids/lib/packet_history.h > +++ b/net/dccp/ccids/lib/packet_history.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * Packet RX/TX history data structures and routines for TFRC-based protocols. > * > @@ -17,20 +18,6 @@ > * Arnaldo Carvalho de Melo <acme@xxxxxxxxxxxxxxxx>. > * > * Copyright (c) 2005 Arnaldo Carvalho de Melo <acme@xxxxxxxxxxxxxxxx> > - * > - * 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. > - * > - * You should have received a copy of the GNU General Public License > - * along with this program; if not, write to the Free Software > - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > */ > > #ifndef _DCCP_PKT_HIST_ > >
