diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-01-31 16:52:41 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-01 11:41:00 +0100 |
| commit | 206bebcad40ceade2a1992c86b29b6645e303764 (patch) | |
| tree | c04cf7d0396743462d6e077f30f4207000e73959 /target/linux/layerscape/patches-4.14 | |
| parent | 604eb945508e32aeaf4dbfd5ffb5137de6223b38 (diff) | |
| download | upstream-206bebcad40ceade2a1992c86b29b6645e303764.tar.gz upstream-206bebcad40ceade2a1992c86b29b6645e303764.tar.bz2 upstream-206bebcad40ceade2a1992c86b29b6645e303764.zip | |
kernel: bump 4.14 to 4.14.97
Refreshed all patches.
Adapted patches:
- 012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/layerscape/patches-4.14')
| -rw-r--r-- | target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch | 2 | ||||
| -rw-r--r-- | target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch | 8 |
2 files changed, 5 insertions, 5 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 15ccde48c6..bef6de235f 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 @@ -241,7 +241,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> void __kfree_skb(struct sk_buff *skb); extern struct kmem_cache *skbuff_head_cache; -@@ -3293,6 +3294,7 @@ static inline void skb_free_datagram_loc +@@ -3294,6 +3295,7 @@ static inline void skb_free_datagram_loc } int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags); int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len); 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 5fd8350b6b..45ed8efa9f 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 @@ -432,7 +432,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> reg &= ~DWC3_DCTL_INITU2ENA; --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c -@@ -3203,6 +3203,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) +@@ -3205,6 +3205,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) { int ret; int irq; @@ -440,7 +440,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> irq = dwc3_gadget_get_irq(dwc); if (irq < 0) { -@@ -3279,6 +3280,12 @@ int dwc3_gadget_init(struct dwc3 *dwc) +@@ -3281,6 +3282,12 @@ int dwc3_gadget_init(struct dwc3 *dwc) goto err4; } @@ -1253,7 +1253,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> while (ep_ring->dequeue != td->last_trb) --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1599,13 +1599,38 @@ static int xhci_urb_dequeue(struct usb_h +@@ -1597,13 +1597,38 @@ static int xhci_urb_dequeue(struct usb_h ret = -ENOMEM; goto done; } @@ -1298,7 +1298,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> } done: spin_unlock_irqrestore(&xhci->lock, flags); -@@ -4990,7 +5015,7 @@ int xhci_gen_setup(struct usb_hcd *hcd, +@@ -4988,7 +5013,7 @@ int xhci_gen_setup(struct usb_hcd *hcd, return retval; xhci_dbg(xhci, "Called HCD init\n"); |