From 0e87b6aa109083d4d32269a3819ba291f382b2cf Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 1 May 2018 08:31:56 -0700 Subject: [PATCH] 4.16-stable patches added patches: sparc64-fix-mistake-in-oradax-license-text.patch --- queue-4.16/series | 1 + ...4-fix-mistake-in-oradax-license-text.patch | 44 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 queue-4.16/sparc64-fix-mistake-in-oradax-license-text.patch diff --git a/queue-4.16/series b/queue-4.16/series index 4891ab85aa8..9d9c63d4529 100644 --- a/queue-4.16/series +++ b/queue-4.16/series @@ -111,3 +111,4 @@ x86-microcode-do-not-exit-early-from-__reload_late.patch tick-sched-do-not-mess-with-an-enqueued-hrtimer.patch crypto-ccp-add-check-to-get-psp-master-only-when-psp-is-detected.patch arm-arm64-kvm-add-psci-version-selection-api.patch +sparc64-fix-mistake-in-oradax-license-text.patch diff --git a/queue-4.16/sparc64-fix-mistake-in-oradax-license-text.patch b/queue-4.16/sparc64-fix-mistake-in-oradax-license-text.patch new file mode 100644 index 00000000000..cabee4e1c0b --- /dev/null +++ b/queue-4.16/sparc64-fix-mistake-in-oradax-license-text.patch @@ -0,0 +1,44 @@ +From d3c68d0b4183ddfa05577348a231dd117e6563df Mon Sep 17 00:00:00 2001 +From: Rob Gardner +Date: Fri, 20 Apr 2018 12:48:25 -0600 +Subject: sparc64: Fix mistake in oradax license text + +From: Rob Gardner + +commit d3c68d0b4183ddfa05577348a231dd117e6563df upstream. + +The license text in both oradax files mistakenly specifies "version 3" of +the GNU General Public License. This is corrected to specify "version 2". + +Signed-off-by: Rob Gardner +Signed-off-by: Jonathan Helman +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + +--- + arch/sparc/include/uapi/asm/oradax.h | 2 +- + drivers/sbus/char/oradax.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/sparc/include/uapi/asm/oradax.h ++++ b/arch/sparc/include/uapi/asm/oradax.h +@@ -3,7 +3,7 @@ + * + * 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 3 of the License, or ++ * 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, +--- a/drivers/sbus/char/oradax.c ++++ b/drivers/sbus/char/oradax.c +@@ -3,7 +3,7 @@ + * + * 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 3 of the License, or ++ * 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, -- 2.47.3