diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2017-09-10 23:37:48 +0200 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2017-09-11 01:56:14 +0200 |
| commit | d5b7215e3144c32893e7bc44056bac1e217dd9f3 (patch) | |
| tree | cfb178a60628f6c2bd331e6e7fbedf7e1d7955a1 /target/linux/generic | |
| parent | c11762e435e13a7fbefb0406acad75b87c18312b (diff) | |
| download | upstream-d5b7215e3144c32893e7bc44056bac1e217dd9f3.tar.gz upstream-d5b7215e3144c32893e7bc44056bac1e217dd9f3.tar.bz2 upstream-d5b7215e3144c32893e7bc44056bac1e217dd9f3.zip | |
kernel: update 4.9 to 4.9.49
Refresh patches.
Compile-tested on octeon and x86/64.
Runtime-tested on octeon and x86/64.
Fixes CVE-2017-11600.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/pending-4.9/811-pci_disable_usb_common_quirks.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-4.9/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/pending-4.9/811-pci_disable_usb_common_quirks.patch index e2d8a32713..9dbb2ca8cd 100644 --- a/target/linux/generic/pending-4.9/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/pending-4.9/811-pci_disable_usb_common_quirks.patch @@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static struct amd_chipset_info { struct pci_dev *nb_dev; struct pci_dev *smbus_dev; -@@ -510,6 +512,10 @@ void usb_amd_dev_put(void) +@@ -511,6 +513,10 @@ void usb_amd_dev_put(void) } EXPORT_SYMBOL_GPL(usb_amd_dev_put); @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /* * Make sure the controller is completely inactive, unable to * generate interrupts or do DMA. -@@ -589,8 +595,17 @@ reset_needed: +@@ -590,8 +596,17 @@ reset_needed: uhci_reset_hc(pdev, base); return 1; } @@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) { u16 cmd; -@@ -1157,3 +1172,4 @@ static void quirk_usb_early_handoff(stru +@@ -1158,3 +1173,4 @@ static void quirk_usb_early_handoff(stru } DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff); |