diff options
| author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-01-07 14:08:03 +0000 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2018-01-10 00:11:39 +0200 |
| commit | 1d2590f83826bb9cdf658001761593519186ce0e (patch) | |
| tree | 9c007d2f47fb56b1e766f278fd4cf4f4a597424f /target/linux/apm821xx | |
| parent | e1b653944d5c11be1cf82f6b0ae25c8ce6516869 (diff) | |
| download | upstream-1d2590f83826bb9cdf658001761593519186ce0e.tar.gz upstream-1d2590f83826bb9cdf658001761593519186ce0e.tar.bz2 upstream-1d2590f83826bb9cdf658001761593519186ce0e.zip | |
kernel: bump 4.9 to 4.9.75
Refresh patches
Fixes: CVE-2017-5754 aka Meltdown
Tested-on: ar71xx Archer C7 v2
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
[fix conflict after 4.14 bump]
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/apm821xx')
| -rw-r--r-- | target/linux/apm821xx/patches-4.9/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch | 6 | ||||
| -rw-r--r-- | target/linux/apm821xx/patches-4.9/802-usb-xhci-force-msi-renesas-xhci.patch | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/apm821xx/patches-4.9/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch b/target/linux/apm821xx/patches-4.9/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch index 96a5940e79..b30511d756 100644 --- a/target/linux/apm821xx/patches-4.9/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch +++ b/target/linux/apm821xx/patches-4.9/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch @@ -44,7 +44,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> #include "xhci.h" #include "xhci-trace.h" -@@ -236,6 +238,458 @@ static void xhci_pme_acpi_rtd3_enable(st +@@ -239,6 +241,458 @@ static void xhci_pme_acpi_rtd3_enable(st static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { } #endif /* CONFIG_ACPI */ @@ -503,7 +503,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> /* called during probe() after chip reset completes */ static int xhci_pci_setup(struct usb_hcd *hcd) { -@@ -275,6 +729,22 @@ static int xhci_pci_probe(struct pci_dev +@@ -278,6 +732,22 @@ static int xhci_pci_probe(struct pci_dev struct hc_driver *driver; struct usb_hcd *hcd; @@ -526,7 +526,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> driver = (struct hc_driver *)id->driver_data; /* Prevent runtime suspending between USB-2 and USB-3 initialization */ -@@ -332,6 +802,16 @@ static void xhci_pci_remove(struct pci_d +@@ -335,6 +805,16 @@ static void xhci_pci_remove(struct pci_d { struct xhci_hcd *xhci; diff --git a/target/linux/apm821xx/patches-4.9/802-usb-xhci-force-msi-renesas-xhci.patch b/target/linux/apm821xx/patches-4.9/802-usb-xhci-force-msi-renesas-xhci.patch index 4d7c686618..3548571052 100644 --- a/target/linux/apm821xx/patches-4.9/802-usb-xhci-force-msi-renesas-xhci.patch +++ b/target/linux/apm821xx/patches-4.9/802-usb-xhci-force-msi-renesas-xhci.patch @@ -13,8 +13,8 @@ produce a noisy warning. --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -193,7 +193,7 @@ static void xhci_pci_quirks(struct devic - } +@@ -196,7 +196,7 @@ static void xhci_pci_quirks(struct devic + xhci->quirks |= XHCI_TRUST_TX_LENGTH; if (pdev->vendor == PCI_VENDOR_ID_RENESAS && pdev->device == 0x0015) - xhci->quirks |= XHCI_RESET_ON_RESUME; |