]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.16-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 1 May 2018 15:31:56 +0000 (08:31 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 1 May 2018 15:31:56 +0000 (08:31 -0700)
added patches:
sparc64-fix-mistake-in-oradax-license-text.patch

queue-4.16/series
queue-4.16/sparc64-fix-mistake-in-oradax-license-text.patch [new file with mode: 0644]

index 4891ab85aa8c218a522b8933985397b8a8bb0831..9d9c63d4529c147b1638d3b4d3f4bbdedabcddb3 100644 (file)
@@ -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 (file)
index 0000000..cabee4e
--- /dev/null
@@ -0,0 +1,44 @@
+From d3c68d0b4183ddfa05577348a231dd117e6563df Mon Sep 17 00:00:00 2001
+From: Rob Gardner <rob.gardner@oracle.com>
+Date: Fri, 20 Apr 2018 12:48:25 -0600
+Subject: sparc64: Fix mistake in oradax license text
+
+From: Rob Gardner <rob.gardner@oracle.com>
+
+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 <rob.gardner@oracle.com>
+Signed-off-by: Jonathan Helman <jonathan.helman@oracle.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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,