rename "GPL-2.0+" to "GPL-2.0-or-later"

This makes `reuse lint` happy as well as license lawyers...

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

31 files changed, 31 insertions, 31 deletions

diff --git a/.gitmodules b/.gitmodules
index 162ef75..c568cc8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (c) 2010 Nikolai Kondrashov <spbnick@gmail.com>
 
 [submodule "usbhid-dump"]
diff --git a/Makefile.am b/Makefile.am
index b348605..754ca2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (c) 2004 Thomas Sailer <sailer@ife.ee.ethz.ch>
 # Copyright (c) 2005-2006 David Brownell <dbrownell@users.sourceforge.net>
 # Copyright (c) 2009 Kay Sievers <kay.sievers@vrfy.org>
diff --git a/README.md b/README.md
index d933fa5..6f27551 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <!---
-SPDX-License-Identifier: GPL-2.0+
+SPDX-License-Identifier: GPL-2.0-or-later
 Copyright (c) 2018 Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -->
 # usbutils
diff --git a/desc-defs.c b/desc-defs.c
index d348abc..30afb69 100644
--- a/desc-defs.c
+++ b/desc-defs.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * USB descriptor definitions
  *
diff --git a/desc-defs.h b/desc-defs.h
index aa695e4..27891bc 100644
--- a/desc-defs.h
+++ b/desc-defs.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * USB descriptor definitions
  *
diff --git a/desc-dump.c b/desc-dump.c
index a8759f4..076cb6f 100644
--- a/desc-dump.c
+++ b/desc-dump.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * USB descriptor dumping
  *
diff --git a/desc-dump.h b/desc-dump.h
index ef426bc..a6191a1 100644
--- a/desc-dump.h
+++ b/desc-dump.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * USB descriptor dumping
  *
diff --git a/lsusb.c b/lsusb.c
index 1d7c105..28e8862 100644
--- a/lsusb.c
+++ b/lsusb.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * lspci like utility for the USB bus
  *
diff --git a/lsusb.h b/lsusb.h
index 62f9625..3e93c23 100644
--- a/lsusb.h
+++ b/lsusb.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* Copyright 2011 (c) Greg Kroah-Hartman <gregkh@suse.de> */
 #ifndef _LSUSB_H
 #define _LSUSB_H
diff --git a/names.c b/names.c
index 8142c96..c8cdd02 100644
--- a/names.c
+++ b/names.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * USB name database manipulation routines
  *
diff --git a/names.h b/names.h
index f79d780..4dac2e0 100644
--- a/names.h
+++ b/names.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * USB name database manipulation routines
  *
diff --git a/sysfs.c b/sysfs.c
index d5caefb..e073aa8 100644
--- a/sysfs.c
+++ b/sysfs.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Helpers for querying USB properties from sysfs
  *
diff --git a/sysfs.h b/sysfs.h
index 2a6ede3..63771f5 100644
--- a/sysfs.h
+++ b/sysfs.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Helpers for querying USB properties from sysfs
  *
diff --git a/usb-devices b/usb-devices
index 7627fb1..0f31bc0 100755
--- a/usb-devices
+++ b/usb-devices
@@ -1,5 +1,5 @@
 #!/bin/sh
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 # Copyright (c) 2009 Greg Kroah-Hartman <greg@kroah.com>
 # Copyright (c) 2009 Randy Dunlap <rdunlap@xenotime.net>
diff --git a/usb-spec.h b/usb-spec.h
index 0938e10..8a917e2 100644
--- a/usb-spec.h
+++ b/usb-spec.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * USB specification data
  *
diff --git a/usbhid-dump.8.in b/usbhid-dump.8.in
index 1589075..8102a86 100644
--- a/usbhid-dump.8.in
+++ b/usbhid-dump.8.in
@@ -1,4 +1,4 @@
-.\"SPDX-License-Identifier: GPL-2.0+
+.\"SPDX-License-Identifier: GPL-2.0-or-later
 .TH usbhid-dump "8" "February 2012" "usbutils-VERSION" "Linux USB Utilities"
 .IX usbhid-dump
 .SH NAME
diff --git a/usbhid-dump/Makefile.am b/usbhid-dump/Makefile.am
index 21a0c0b..3ba22f0 100644
--- a/usbhid-dump/Makefile.am
+++ b/usbhid-dump/Makefile.am
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 # Copyright (C) 2009-2010 Nikolai Kondrashov
 #
diff --git a/usbhid-dump/configure.ac b/usbhid-dump/configure.ac
index 4123a9f..f07e47a 100644
--- a/usbhid-dump/configure.ac
+++ b/usbhid-dump/configure.ac
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 # Copyright (C) 2010-2011 Nikolai Kondrashov
 #
diff --git a/usbhid-dump/src/Makefile.am b/usbhid-dump/src/Makefile.am
index af4890a..262bb74 100644
--- a/usbhid-dump/src/Makefile.am
+++ b/usbhid-dump/src/Makefile.am
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 # Copyright (C) 2010 Nikolai Kondrashov
 
diff --git a/usbhid-dump/src/dev.c b/usbhid-dump/src/dev.c
index 9d27eed..1978496 100644
--- a/usbhid-dump/src/dev.c
+++ b/usbhid-dump/src/dev.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * usbhid-dump - device
  *
diff --git a/usbhid-dump/src/dev.h b/usbhid-dump/src/dev.h
index bd34cb6..3f647a5 100644
--- a/usbhid-dump/src/dev.h
+++ b/usbhid-dump/src/dev.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * usbhid-dump - device
  *
diff --git a/usbhid-dump/src/dev_list.c b/usbhid-dump/src/dev_list.c
index 346193f..9848902 100644
--- a/usbhid-dump/src/dev_list.c
+++ b/usbhid-dump/src/dev_list.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * usbhid-dump - device list
  *
diff --git a/usbhid-dump/src/dev_list.h b/usbhid-dump/src/dev_list.h
index 06a2cb8..5c70ad1 100644
--- a/usbhid-dump/src/dev_list.h
+++ b/usbhid-dump/src/dev_list.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * usbhid-dump - device list
  *
diff --git a/usbhid-dump/src/iface.c b/usbhid-dump/src/iface.c
index fced67a..7bcf28b 100644
--- a/usbhid-dump/src/iface.c
+++ b/usbhid-dump/src/iface.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * usbhid-dump - interface
  *
diff --git a/usbhid-dump/src/iface.h b/usbhid-dump/src/iface.h
index f467214..0e1da6b 100644
--- a/usbhid-dump/src/iface.h
+++ b/usbhid-dump/src/iface.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * usbhid-dump - interface
  *
diff --git a/usbhid-dump/src/iface_list.c b/usbhid-dump/src/iface_list.c
index 85ee7a5..3c82504 100644
--- a/usbhid-dump/src/iface_list.c
+++ b/usbhid-dump/src/iface_list.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * usbhid-dump - interface list
  *
diff --git a/usbhid-dump/src/iface_list.h b/usbhid-dump/src/iface_list.h
index b439b2a..d99f761 100644
--- a/usbhid-dump/src/iface_list.h
+++ b/usbhid-dump/src/iface_list.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * usbhid-dump - interface list
  *
diff --git a/usbhid-dump/src/misc.h b/usbhid-dump/src/misc.h
index bb623b0..17b7e6a 100644
--- a/usbhid-dump/src/misc.h
+++ b/usbhid-dump/src/misc.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * usbhid-dump - miscellaneous declarations
  *
diff --git a/usbhid-dump/src/usbhid-dump.c b/usbhid-dump/src/usbhid-dump.c
index 45da1ed..bd669e2 100644
--- a/usbhid-dump/src/usbhid-dump.c
+++ b/usbhid-dump/src/usbhid-dump.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * usbhid-dump - entry point *
  *
diff --git a/usbmisc.c b/usbmisc.c
index ba0591f..b12928f 100644
--- a/usbmisc.c
+++ b/usbmisc.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Misc USB routines
  *
diff --git a/usbmisc.h b/usbmisc.h
index 0826746..24b27ee 100644
--- a/usbmisc.h
+++ b/usbmisc.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Misc USB routines
  *