[linux] 05/05: media: dvb-usb-dibusb-mc-common: Add MODULE_LICENSE (Closes: #853110)

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Fri Feb 17 03:59:08 UTC 2017


This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 92d269eac2f5937e2a7d8d1e75f9fb448be5f385
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Feb 17 02:56:32 2017 +0000

    media: dvb-usb-dibusb-mc-common: Add MODULE_LICENSE (Closes: #853110)
---
 debian/changelog                                   |  1 +
 ...b-usb-dibusb-mc-common-add-module_license.patch | 28 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c20b2f0..e807c96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -258,6 +258,7 @@ linux (4.9.10-1) UNRELEASED; urgency=medium
   * [x86] platform: acer-wmi: setup accelerometer when machine has appropriate
     notify event (Closes: #853067)
   * [x86] xen: Fix APIC id mismatch warning on Intel (Closes: #853193)
+  * media: dvb-usb-dibusb-mc-common: Add MODULE_LICENSE (Closes: #853110)
 
   [ Roger Shimizu ]
   * [armel] ARM: dts: orion5x-lschl: Fix model name
diff --git a/debian/patches/bugfix/all/media-dvb-usb-dibusb-mc-common-add-module_license.patch b/debian/patches/bugfix/all/media-dvb-usb-dibusb-mc-common-add-module_license.patch
new file mode 100644
index 0000000..8da00ef
--- /dev/null
+++ b/debian/patches/bugfix/all/media-dvb-usb-dibusb-mc-common-add-module_license.patch
@@ -0,0 +1,28 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Fri, 17 Feb 2017 02:51:21 +0000
+Subject: [media] dvb-usb-dibusb-mc-common: Add MODULE_LICENSE
+Bug-Debian: https://bugs.debian.org/853110
+
+dvb-usb-dibusb-mc-common is licensed under GPLv2, and if we don't say
+so then it won't even load since it needs a GPL-only symbol.
+
+Reported-by: Dominique Dumont <dod at debian.org>
+References: https://bugs.debian.org/853110
+Cc: stable at vger.kernel.org # 4.9+
+Fixes: e91455a1495a ("[media] dvb-usb: split out common parts of dibusb")
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ drivers/media/usb/dvb-usb/dibusb-mc-common.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/media/usb/dvb-usb/dibusb-mc-common.c
++++ b/drivers/media/usb/dvb-usb/dibusb-mc-common.c
+@@ -12,6 +12,8 @@
+ #include <linux/kconfig.h>
+ #include "dibusb.h"
+ 
++MODULE_LICENSE("GPL");
++
+ /* 3000MC/P stuff */
+ // Config Adjacent channels  Perf -cal22
+ static struct dibx000_agc_config dib3000p_mt2060_agc_config = {
diff --git a/debian/patches/series b/debian/patches/series
index be8372c..02e3664 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -78,6 +78,7 @@ bugfix/all/ath9k-fix-null-pointer-dereference.patch
 bugfix/all/nbd-fix-64-bit-division.patch
 bugfix/all/pegasus-use-heap-buffers-for-all-register-access.patch
 bugfix/all/net-ipv6-check-route-protocol-when-deleting-routes.patch
+bugfix/all/media-dvb-usb-dibusb-mc-common-add-module_license.patch
 
 # Miscellaneous features
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git



More information about the Kernel-svn-changes mailing list