diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2021-02-01 10:35:34 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2021-02-02 11:52:31 +0100 |
| commit | 312c05611b228d6d336364a2e10a53bb95e274ee (patch) | |
| tree | 89003f960c720addc7050beb289820a87eb2a69a /target/linux/generic | |
| parent | 3100649458387f844aa447bdb3bbac3e4d7e32da (diff) | |
| download | upstream-312c05611b228d6d336364a2e10a53bb95e274ee.tar.gz upstream-312c05611b228d6d336364a2e10a53bb95e274ee.tar.bz2 upstream-312c05611b228d6d336364a2e10a53bb95e274ee.zip | |
kernel: bump 4.14 to 4.14.218
Refreshed all patches.
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/generic')
3 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/backport-4.14/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch b/target/linux/generic/backport-4.14/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch index 8993b6376c..0c2d27ed65 100644 --- a/target/linux/generic/backport-4.14/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch +++ b/target/linux/generic/backport-4.14/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch @@ -84,7 +84,7 @@ Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h -@@ -366,3 +366,30 @@ +@@ -372,3 +372,30 @@ #if GCC_VERSION >= 50100 #define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1 #endif diff --git a/target/linux/generic/hack-4.14/721-phy_packets.patch b/target/linux/generic/hack-4.14/721-phy_packets.patch index cd10a3d6cb..684cd3911f 100644 --- a/target/linux/generic/hack-4.14/721-phy_packets.patch +++ b/target/linux/generic/hack-4.14/721-phy_packets.patch @@ -136,7 +136,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #include <net/protocol.h> #include <net/dst.h> -@@ -508,6 +509,22 @@ skb_fail: +@@ -512,6 +513,22 @@ skb_fail: } EXPORT_SYMBOL(__napi_alloc_skb); diff --git a/target/linux/generic/pending-4.14/110-ehci_hcd_ignore_oc.patch b/target/linux/generic/pending-4.14/110-ehci_hcd_ignore_oc.patch index 4a7f7cfce3..24e4553e45 100644 --- a/target/linux/generic/pending-4.14/110-ehci_hcd_ignore_oc.patch +++ b/target/linux/generic/pending-4.14/110-ehci_hcd_ignore_oc.patch @@ -17,7 +17,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org> --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -652,7 +652,7 @@ static int ehci_run (struct usb_hcd *hcd +@@ -664,7 +664,7 @@ static int ehci_run (struct usb_hcd *hcd "USB %x.%x started, EHCI %x.%02x%s\n", ((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f), temp >> 8, temp & 0xff, @@ -28,7 +28,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org> &ehci->regs->intr_enable); /* Turn On Interrupts */ --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c -@@ -645,7 +645,7 @@ ehci_hub_status_data (struct usb_hcd *hc +@@ -648,7 +648,7 @@ ehci_hub_status_data (struct usb_hcd *hc * always set, seem to clear PORT_OCC and PORT_CSC when writing to * PORT_POWER; that's surprising, but maybe within-spec. */ @@ -37,7 +37,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org> mask = PORT_CSC | PORT_PEC | PORT_OCC; else mask = PORT_CSC | PORT_PEC; -@@ -1015,7 +1015,7 @@ int ehci_hub_control( +@@ -1018,7 +1018,7 @@ int ehci_hub_control( if (temp & PORT_PEC) status |= USB_PORT_STAT_C_ENABLE << 16; |