Update to 4.11.3
This commit is contained in:
parent
65c1808993
commit
7b53b52f6f
|
@ -1,5 +1,11 @@
|
||||||
linux (4.11-1~exp3) UNRELEASED; urgency=medium
|
linux (4.11.3-1~exp1) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
|
* New upstream stable update:
|
||||||
|
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.11.1
|
||||||
|
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.11.2
|
||||||
|
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.11.3
|
||||||
|
|
||||||
|
[ Ben Hutchings ]
|
||||||
* [armel] udeb: Add af_packet. firmware_class, nls_base to kernel-image
|
* [armel] udeb: Add af_packet. firmware_class, nls_base to kernel-image
|
||||||
(fixes FTBFS)
|
(fixes FTBFS)
|
||||||
* [m68k] Update 'Revert "m68k: move exports to definitions"' for 4.11
|
* [m68k] Update 'Revert "m68k: move exports to definitions"' for 4.11
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
From: Ben Hutchings <ben@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
|
|
||||||
Forwarded: https://patchwork.kernel.org/patch/9580907/
|
|
||||||
|
|
||||||
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@debian.org>
|
|
||||||
References: https://bugs.debian.org/853110
|
|
||||||
Cc: stable@vger.kernel.org # 4.9+
|
|
||||||
Fixes: e91455a1495a ("[media] dvb-usb: split out common parts of dibusb")
|
|
||||||
Signed-off-by: Ben Hutchings <ben@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
|
|
||||||
@@ -11,6 +11,8 @@
|
|
||||||
|
|
||||||
#include "dibusb.h"
|
|
||||||
|
|
||||||
+MODULE_LICENSE("GPL");
|
|
||||||
+
|
|
||||||
/* 3000MC/P stuff */
|
|
||||||
// Config Adjacent channels Perf -cal22
|
|
||||||
static struct dibx000_agc_config dib3000p_mt2060_agc_config = {
|
|
|
@ -17,11 +17,9 @@ Signed-off-by: David Howells <dhowells@redhat.com>
|
||||||
drivers/pci/syscall.c | 2 +-
|
drivers/pci/syscall.c | 2 +-
|
||||||
3 files changed, 17 insertions(+), 2 deletions(-)
|
3 files changed, 17 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
|
|
||||||
index 25d010d449a3..f70b3668036f 100644
|
|
||||||
--- a/drivers/pci/pci-sysfs.c
|
--- a/drivers/pci/pci-sysfs.c
|
||||||
+++ b/drivers/pci/pci-sysfs.c
|
+++ b/drivers/pci/pci-sysfs.c
|
||||||
@@ -727,6 +727,9 @@ static ssize_t pci_write_config(struct file *filp, struct kobject *kobj,
|
@@ -727,6 +727,9 @@ static ssize_t pci_write_config(struct f
|
||||||
loff_t init_off = off;
|
loff_t init_off = off;
|
||||||
u8 *data = (u8 *) buf;
|
u8 *data = (u8 *) buf;
|
||||||
|
|
||||||
|
@ -31,7 +29,7 @@ index 25d010d449a3..f70b3668036f 100644
|
||||||
if (off > dev->cfg_size)
|
if (off > dev->cfg_size)
|
||||||
return 0;
|
return 0;
|
||||||
if (off + count > dev->cfg_size) {
|
if (off + count > dev->cfg_size) {
|
||||||
@@ -1018,6 +1021,9 @@ static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,
|
@@ -1022,6 +1025,9 @@ static int pci_mmap_resource(struct kobj
|
||||||
resource_size_t start, end;
|
resource_size_t start, end;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -41,7 +39,7 @@ index 25d010d449a3..f70b3668036f 100644
|
||||||
for (i = 0; i < PCI_ROM_RESOURCE; i++)
|
for (i = 0; i < PCI_ROM_RESOURCE; i++)
|
||||||
if (res == &pdev->resource[i])
|
if (res == &pdev->resource[i])
|
||||||
break;
|
break;
|
||||||
@@ -1117,6 +1123,9 @@ static ssize_t pci_write_resource_io(struct file *filp, struct kobject *kobj,
|
@@ -1121,6 +1127,9 @@ static ssize_t pci_write_resource_io(str
|
||||||
struct bin_attribute *attr, char *buf,
|
struct bin_attribute *attr, char *buf,
|
||||||
loff_t off, size_t count)
|
loff_t off, size_t count)
|
||||||
{
|
{
|
||||||
|
@ -51,11 +49,9 @@ index 25d010d449a3..f70b3668036f 100644
|
||||||
return pci_resource_io(filp, kobj, attr, buf, off, count, true);
|
return pci_resource_io(filp, kobj, attr, buf, off, count, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
|
|
||||||
index f82710a8694d..139d6f09ae7b 100644
|
|
||||||
--- a/drivers/pci/proc.c
|
--- a/drivers/pci/proc.c
|
||||||
+++ b/drivers/pci/proc.c
|
+++ b/drivers/pci/proc.c
|
||||||
@@ -116,6 +116,9 @@ static ssize_t proc_bus_pci_write(struct file *file, const char __user *buf,
|
@@ -116,6 +116,9 @@ static ssize_t proc_bus_pci_write(struct
|
||||||
int size = dev->cfg_size;
|
int size = dev->cfg_size;
|
||||||
int cnt;
|
int cnt;
|
||||||
|
|
||||||
|
@ -65,7 +61,7 @@ index f82710a8694d..139d6f09ae7b 100644
|
||||||
if (pos >= size)
|
if (pos >= size)
|
||||||
return 0;
|
return 0;
|
||||||
if (nbytes >= size)
|
if (nbytes >= size)
|
||||||
@@ -195,6 +198,9 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
|
@@ -195,6 +198,9 @@ static long proc_bus_pci_ioctl(struct fi
|
||||||
#endif /* HAVE_PCI_MMAP */
|
#endif /* HAVE_PCI_MMAP */
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
|
@ -75,20 +71,18 @@ index f82710a8694d..139d6f09ae7b 100644
|
||||||
switch (cmd) {
|
switch (cmd) {
|
||||||
case PCIIOC_CONTROLLER:
|
case PCIIOC_CONTROLLER:
|
||||||
ret = pci_domain_nr(dev->bus);
|
ret = pci_domain_nr(dev->bus);
|
||||||
@@ -233,7 +239,7 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma)
|
@@ -233,7 +239,7 @@ static int proc_bus_pci_mmap(struct file
|
||||||
struct pci_filp_private *fpriv = file->private_data;
|
struct pci_filp_private *fpriv = file->private_data;
|
||||||
int i, ret, write_combine;
|
int i, ret, write_combine = 0, res_bit;
|
||||||
|
|
||||||
- if (!capable(CAP_SYS_RAWIO))
|
- if (!capable(CAP_SYS_RAWIO))
|
||||||
+ if (!capable(CAP_SYS_RAWIO) || kernel_is_locked_down())
|
+ if (!capable(CAP_SYS_RAWIO) || kernel_is_locked_down())
|
||||||
return -EPERM;
|
return -EPERM;
|
||||||
|
|
||||||
/* Make sure the caller is mapping a real resource for this device */
|
if (fpriv->mmap_state == pci_mmap_io)
|
||||||
diff --git a/drivers/pci/syscall.c b/drivers/pci/syscall.c
|
|
||||||
index 9bf993e1f71e..c09524738ceb 100644
|
|
||||||
--- a/drivers/pci/syscall.c
|
--- a/drivers/pci/syscall.c
|
||||||
+++ b/drivers/pci/syscall.c
|
+++ b/drivers/pci/syscall.c
|
||||||
@@ -92,7 +92,7 @@ SYSCALL_DEFINE5(pciconfig_write, unsigned long, bus, unsigned long, dfn,
|
@@ -92,7 +92,7 @@ SYSCALL_DEFINE5(pciconfig_write, unsigne
|
||||||
u32 dword;
|
u32 dword;
|
||||||
int err = 0;
|
int err = 0;
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,6 @@ bugfix/all/disable-some-marvell-phys.patch
|
||||||
bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
|
bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
|
||||||
bugfix/all/kbuild-do-not-use-hyphen-in-exported-variable-name.patch
|
bugfix/all/kbuild-do-not-use-hyphen-in-exported-variable-name.patch
|
||||||
bugfix/all/partially-revert-usb-kconfig-using-select-for-usb_co.patch
|
bugfix/all/partially-revert-usb-kconfig-using-select-for-usb_co.patch
|
||||||
bugfix/all/media-dvb-usb-dibusb-mc-common-add-module_license.patch
|
|
||||||
bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch
|
bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch
|
||||||
|
|
||||||
# Miscellaneous features
|
# Miscellaneous features
|
||||||
|
|
Loading…
Reference in New Issue