From 07720c392f1697cd3f79e181da624f0604bbb210 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Thu, 2 May 2019 14:30:50 +0200 Subject: kernel: bump 4.14 to 4.14.115 Refreshed all patches. Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte --- .../950-0024-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch | 2 +- target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch | 4 ++-- .../layerscape/patches-4.14/202-core-linux-support-layerscape.patch | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux') diff --git a/target/linux/brcm2708/patches-4.14/950-0024-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch b/target/linux/brcm2708/patches-4.14/950-0024-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch index c1c555b940..7bfecf6674 100644 --- a/target/linux/brcm2708/patches-4.14/950-0024-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch +++ b/target/linux/brcm2708/patches-4.14/950-0024-kbuild-Ignore-dtco-targets-when-filtering-symbols.patch @@ -9,7 +9,7 @@ Subject: [PATCH 024/454] kbuild: Ignore dtco targets when filtering symbols --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include -@@ -294,7 +294,7 @@ ksym_dep_filter = +@@ -292,7 +292,7 @@ ksym_dep_filter = $(CPP) $(call flags_nodeps,c_flags) -D__KSYM_DEPS__ $< ;; \ as_*_S|cpp_s_S) \ $(CPP) $(call flags_nodeps,a_flags) -D__KSYM_DEPS__ $< ;; \ diff --git a/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch b/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch index f11406ed57..b80a38d6a8 100644 --- a/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch +++ b/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch @@ -841,7 +841,7 @@ Signed-off-by: Malik Olivier Boussejra } --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5094,7 +5094,7 @@ static void port_event(struct usb_hub *h +@@ -5091,7 +5091,7 @@ static void port_event(struct usb_hub *h if (portchange & USB_PORT_STAT_C_OVERCURRENT) { u16 status = 0, unused; @@ -852,7 +852,7 @@ Signed-off-by: Malik Olivier Boussejra msleep(100); /* Cool down */ --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c -@@ -1924,6 +1924,85 @@ free_interfaces: +@@ -1923,6 +1923,85 @@ free_interfaces: if (cp->string == NULL && !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) cp->string = usb_cache_string(dev, cp->desc.iConfiguration); 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 fc1de9cbc3..b60b20049a 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 @@ -106,7 +106,7 @@ Signed-off-by: Biwen Li case '-': --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c -@@ -1947,7 +1947,8 @@ static int team_netpoll_setup(struct net +@@ -1953,7 +1953,8 @@ static int team_netpoll_setup(struct net } #endif -- cgit v1.2.3