diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-12-24 14:36:38 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-12-25 15:51:43 +0100 |
| commit | d13c6d078e97f97ea06b0c5a66de5d4a87d9b6df (patch) | |
| tree | f2011ccb0a4416e51301661ef7f9eac0b495b37a /target/linux/layerscape | |
| parent | f80272dd9c40dae4aeff38fa5c7132a0f5fc198c (diff) | |
| download | upstream-d13c6d078e97f97ea06b0c5a66de5d4a87d9b6df.tar.gz upstream-d13c6d078e97f97ea06b0c5a66de5d4a87d9b6df.tar.bz2 upstream-d13c6d078e97f97ea06b0c5a66de5d4a87d9b6df.zip | |
kernel: bump 4.14 to 4.14.160
Refreshed all patches.
Compile-tested on: ipq40xx, ath79
Runtime-tested on: ipq40xx
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/layerscape')
3 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch index 7be95d49e4..63d12e688e 100644 --- a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch @@ -539,7 +539,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -2344,7 +2344,8 @@ int register_netdevice_notifier(struct n +@@ -2349,7 +2349,8 @@ int register_netdevice_notifier(struct n int unregister_netdevice_notifier(struct notifier_block *nb); struct netdev_notifier_info { @@ -549,7 +549,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> }; struct netdev_notifier_info_ext { -@@ -2376,6 +2377,7 @@ static inline void netdev_notifier_info_ +@@ -2381,6 +2382,7 @@ static inline void netdev_notifier_info_ struct net_device *dev) { info->dev = dev; @@ -557,7 +557,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> } static inline struct net_device * -@@ -2384,6 +2386,12 @@ netdev_notifier_info_to_dev(const struct +@@ -2389,6 +2391,12 @@ netdev_notifier_info_to_dev(const struct return info->dev; } diff --git a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch index 3d8de1e516..a569dff7d6 100644 --- a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch @@ -1289,7 +1289,7 @@ Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com> xhci->quirks |= XHCI_BROKEN_PORT_PED; --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c -@@ -1976,10 +1976,12 @@ static int finish_td(struct xhci_hcd *xh +@@ -1972,10 +1972,12 @@ static int finish_td(struct xhci_hcd *xh union xhci_trb *ep_trb, struct xhci_transfer_event *event, struct xhci_virt_ep *ep, int *status) { @@ -1302,7 +1302,7 @@ Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com> u32 trb_comp_code; int ep_index; -@@ -2002,14 +2004,30 @@ static int finish_td(struct xhci_hcd *xh +@@ -1998,14 +2000,30 @@ static int finish_td(struct xhci_hcd *xh if (trb_comp_code == COMP_STALL_ERROR || xhci_requires_manual_halt_cleanup(xhci, ep_ctx, trb_comp_code)) { diff --git a/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch b/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch index f3f09989a7..216bef0c3f 100644 --- a/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch @@ -5618,7 +5618,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> static void quirk_no_pm_reset(struct pci_dev *dev) { /* -@@ -4878,3 +4885,11 @@ static void quirk_no_ats(struct pci_dev +@@ -4884,3 +4891,11 @@ static void quirk_no_ats(struct pci_dev DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x98e4, quirk_no_ats); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x6900, quirk_no_ats); #endif /* CONFIG_PCI_ATS */ |