From: Koen Vandeputte Date: Wed, 20 Mar 2019 12:28:57 +0000 (+0100) Subject: kernel: bump 4.14 to 4.14.107 X-Git-Tag: v19.07.0-rc1~970 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0304e76cd1124dd4ff70ad1a540b5719cc991b43;p=oweals%2Fopenwrt.git kernel: bump 4.14 to 4.14.107 Refreshed all patches. Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte --- diff --git a/include/kernel-version.mk b/include/kernel-version.mk index b80948ca13..4f6a05660e 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -4,12 +4,12 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .136 LINUX_VERSION-4.9 = .164 -LINUX_VERSION-4.14 = .106 +LINUX_VERSION-4.14 = .107 LINUX_VERSION-4.19 = .25 LINUX_KERNEL_HASH-3.18.136 = 48c8775013d23229462134f911bbb14c7935096fcccfb19ce28ecd5f7154f35c LINUX_KERNEL_HASH-4.9.164 = adf598758d3a5390100ea754ccd64668ccd5eebb3507d78e3588d13f3e73f8e7 -LINUX_KERNEL_HASH-4.14.106 = a0e2af6add699d86cf15e1ee31ad408aa28dbab82f4462450eba51f90e7d2760 +LINUX_KERNEL_HASH-4.14.107 = e48d0f01468e399d03e443527fe7fa277d0bc46df4a66fad97df47ee1f9b4ef4 LINUX_KERNEL_HASH-4.19.25 = 7ec71d90d6e96e6f741676d157ac06f30c75be4eaf1649143a3c8b7d4f919731 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch index 99624f07c1..a819b91b42 100644 --- a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch @@ -506,7 +506,7 @@ #define IGMP_HOST_MEMBERSHIP_REPORT 0x12 /* Ditto */ --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c -@@ -108,7 +108,7 @@ __be32 __skb_flow_get_ports(const struct +@@ -109,7 +109,7 @@ __be32 __skb_flow_get_ports(const struct ports = __skb_header_pointer(skb, thoff + poff, sizeof(_ports), data, hlen, &_ports); if (ports) @@ -850,7 +850,7 @@ *sum = csum_fold(csum_partial(diff, sizeof(diff), --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c -@@ -1857,15 +1857,15 @@ static int vxlan_build_skb(struct sk_buf +@@ -1868,15 +1868,15 @@ static int vxlan_build_skb(struct sk_buf return err; vxh = __skb_push(skb, sizeof(*vxh)); diff --git a/target/linux/ar71xx/patches-4.14/950-add-boardinfo-platform-data.patch b/target/linux/ar71xx/patches-4.14/950-add-boardinfo-platform-data.patch index 6b0d300023..edeac838d9 100644 --- a/target/linux/ar71xx/patches-4.14/950-add-boardinfo-platform-data.patch +++ b/target/linux/ar71xx/patches-4.14/950-add-boardinfo-platform-data.patch @@ -26,7 +26,7 @@ #endif /* __MDIO_BOARD_INFO_H */ --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c -@@ -456,6 +456,17 @@ void mdiobus_free(struct mii_bus *bus) +@@ -455,6 +455,17 @@ void mdiobus_free(struct mii_bus *bus) } EXPORT_SYMBOL(mdiobus_free); @@ -44,7 +44,7 @@ /** * mdiobus_scan - scan a bus for MDIO devices. * @bus: mii_bus to scan -@@ -471,6 +482,7 @@ EXPORT_SYMBOL(mdiobus_free); +@@ -470,6 +481,7 @@ EXPORT_SYMBOL(mdiobus_free); struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr) { struct phy_device *phydev; @@ -52,7 +52,7 @@ int err; phydev = get_phy_device(bus, addr, false); -@@ -483,6 +495,12 @@ struct phy_device *mdiobus_scan(struct m +@@ -482,6 +494,12 @@ struct phy_device *mdiobus_scan(struct m */ of_mdiobus_link_mdiodev(bus, &phydev->mdio); diff --git a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch index e43bc97da3..8666896ab7 100644 --- a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch @@ -486,7 +486,7 @@ #define IGMP_HOST_MEMBERSHIP_REPORT 0x12 /* Ditto */ --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c -@@ -108,7 +108,7 @@ __be32 __skb_flow_get_ports(const struct +@@ -109,7 +109,7 @@ __be32 __skb_flow_get_ports(const struct ports = __skb_header_pointer(skb, thoff + poff, sizeof(_ports), data, hlen, &_ports); if (ports) diff --git a/target/linux/brcm2708/patches-4.14/950-0292-net-mdiobus-add-unlocked-accessors.patch b/target/linux/brcm2708/patches-4.14/950-0292-net-mdiobus-add-unlocked-accessors.patch index 3bf86f612e..5aec47e604 100644 --- a/target/linux/brcm2708/patches-4.14/950-0292-net-mdiobus-add-unlocked-accessors.patch +++ b/target/linux/brcm2708/patches-4.14/950-0292-net-mdiobus-add-unlocked-accessors.patch @@ -19,7 +19,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c -@@ -494,6 +494,55 @@ struct phy_device *mdiobus_scan(struct m +@@ -493,6 +493,55 @@ struct phy_device *mdiobus_scan(struct m EXPORT_SYMBOL(mdiobus_scan); /** @@ -75,7 +75,7 @@ Signed-off-by: David S. Miller * mdiobus_read_nested - Nested version of the mdiobus_read function * @bus: the mii_bus struct * @addr: the phy address -@@ -513,11 +562,9 @@ int mdiobus_read_nested(struct mii_bus * +@@ -512,11 +561,9 @@ int mdiobus_read_nested(struct mii_bus * BUG_ON(in_interrupt()); mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED); @@ -88,7 +88,7 @@ Signed-off-by: David S. Miller return retval; } EXPORT_SYMBOL(mdiobus_read_nested); -@@ -539,11 +586,9 @@ int mdiobus_read(struct mii_bus *bus, in +@@ -538,11 +585,9 @@ int mdiobus_read(struct mii_bus *bus, in BUG_ON(in_interrupt()); mutex_lock(&bus->mdio_lock); @@ -101,7 +101,7 @@ Signed-off-by: David S. Miller return retval; } EXPORT_SYMBOL(mdiobus_read); -@@ -569,11 +614,9 @@ int mdiobus_write_nested(struct mii_bus +@@ -568,11 +613,9 @@ int mdiobus_write_nested(struct mii_bus BUG_ON(in_interrupt()); mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED); @@ -114,7 +114,7 @@ Signed-off-by: David S. Miller return err; } EXPORT_SYMBOL(mdiobus_write_nested); -@@ -596,11 +639,9 @@ int mdiobus_write(struct mii_bus *bus, i +@@ -595,11 +638,9 @@ int mdiobus_write(struct mii_bus *bus, i BUG_ON(in_interrupt()); mutex_lock(&bus->mdio_lock); diff --git a/target/linux/brcm2708/patches-4.14/950-0334-MAINTAINERS-Add-entry-for-BCM2835-camera-driver.patch b/target/linux/brcm2708/patches-4.14/950-0334-MAINTAINERS-Add-entry-for-BCM2835-camera-driver.patch index e35467ec74..2da6c77323 100644 --- a/target/linux/brcm2708/patches-4.14/950-0334-MAINTAINERS-Add-entry-for-BCM2835-camera-driver.patch +++ b/target/linux/brcm2708/patches-4.14/950-0334-MAINTAINERS-Add-entry-for-BCM2835-camera-driver.patch @@ -10,7 +10,7 @@ Signed-off-by: Dave Stevenson --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2765,6 +2765,13 @@ S: Maintained +@@ -2766,6 +2766,13 @@ S: Maintained N: bcm2835 F: drivers/staging/vc04_services diff --git a/target/linux/brcm47xx/patches-4.14/035-v5.1-mips-bcm47xx-Enable-USB-power-on-Netgear-WNDR3400v2.patch b/target/linux/brcm47xx/patches-4.14/035-v5.1-mips-bcm47xx-Enable-USB-power-on-Netgear-WNDR3400v2.patch index 6e8ad0f36c..34a79f9d5b 100644 --- a/target/linux/brcm47xx/patches-4.14/035-v5.1-mips-bcm47xx-Enable-USB-power-on-Netgear-WNDR3400v2.patch +++ b/target/linux/brcm47xx/patches-4.14/035-v5.1-mips-bcm47xx-Enable-USB-power-on-Netgear-WNDR3400v2.patch @@ -22,8 +22,6 @@ Signed-off-by: Paul Burton arch/mips/bcm47xx/workarounds.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/arch/mips/bcm47xx/workarounds.c b/arch/mips/bcm47xx/workarounds.c -index 46eddbe..0ab95dd 100644 --- a/arch/mips/bcm47xx/workarounds.c +++ b/arch/mips/bcm47xx/workarounds.c @@ -24,6 +24,7 @@ void __init bcm47xx_workarounds(void) @@ -34,6 +32,3 @@ index 46eddbe..0ab95dd 100644 case BCM47XX_BOARD_NETGEAR_WNDR3400_V3: bcm47xx_workarounds_enable_usb_power(21); break; --- -1.9.1 - diff --git a/target/linux/generic/backport-4.14/060-v5.1-serial-ar933x_uart-Fix-build-failure-with-disabled-c.patch b/target/linux/generic/backport-4.14/060-v5.1-serial-ar933x_uart-Fix-build-failure-with-disabled-c.patch index cb653170ef..657a869493 100644 --- a/target/linux/generic/backport-4.14/060-v5.1-serial-ar933x_uart-Fix-build-failure-with-disabled-c.patch +++ b/target/linux/generic/backport-4.14/060-v5.1-serial-ar933x_uart-Fix-build-failure-with-disabled-c.patch @@ -31,11 +31,9 @@ Signed-off-by: Greg Kroah-Hartman drivers/tty/serial/ar933x_uart.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) -diff --git a/drivers/tty/serial/ar933x_uart.c b/drivers/tty/serial/ar933x_uart.c -index db5df3d..3bdd56a 100644 --- a/drivers/tty/serial/ar933x_uart.c +++ b/drivers/tty/serial/ar933x_uart.c -@@ -49,11 +49,6 @@ struct ar933x_uart_port { +@@ -52,11 +52,6 @@ struct ar933x_uart_port { struct clk *clk; }; @@ -47,7 +45,7 @@ index db5df3d..3bdd56a 100644 static inline unsigned int ar933x_uart_read(struct ar933x_uart_port *up, int offset) { -@@ -508,6 +503,7 @@ static int ar933x_uart_verify_port(struct uart_port *port, +@@ -511,6 +506,7 @@ static const struct uart_ops ar933x_uart .verify_port = ar933x_uart_verify_port, }; @@ -55,7 +53,7 @@ index db5df3d..3bdd56a 100644 static struct ar933x_uart_port * ar933x_console_ports[CONFIG_SERIAL_AR933X_NR_UARTS]; -@@ -604,14 +600,7 @@ static int ar933x_uart_console_setup(struct console *co, char *options) +@@ -607,14 +603,7 @@ static struct console ar933x_uart_consol .index = -1, .data = &ar933x_uart_driver, }; @@ -71,7 +69,7 @@ index db5df3d..3bdd56a 100644 static struct uart_driver ar933x_uart_driver = { .owner = THIS_MODULE, -@@ -700,7 +689,9 @@ static int ar933x_uart_probe(struct platform_device *pdev) +@@ -703,7 +692,9 @@ static int ar933x_uart_probe(struct plat baud = ar933x_uart_get_baud(port->uartclk, 0, AR933X_UART_MAX_STEP); up->max_baud = min_t(unsigned int, baud, AR933X_UART_MAX_BAUD); @@ -82,7 +80,7 @@ index db5df3d..3bdd56a 100644 ret = uart_add_one_port(&ar933x_uart_driver, &up->port); if (ret) -@@ -749,8 +740,9 @@ static int __init ar933x_uart_init(void) +@@ -752,8 +743,9 @@ static int __init ar933x_uart_init(void) { int ret; @@ -94,6 +92,3 @@ index db5df3d..3bdd56a 100644 ret = uart_register_driver(&ar933x_uart_driver); if (ret) --- -1.9.1 - 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 1ca21db90c..05dafbb69f 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 @@ -74,7 +74,7 @@ Signed-off-by: Biwen Li } else if (has_acpi_companion(dma_dev)) { --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c -@@ -1337,7 +1337,8 @@ void bond_lower_state_changed(struct sla +@@ -1330,7 +1330,8 @@ void bond_lower_state_changed(struct sla } /* enslave device to bond device */ @@ -84,7 +84,7 @@ Signed-off-by: Biwen Li { struct bonding *bond = netdev_priv(bond_dev); const struct net_device_ops *slave_ops = slave_dev->netdev_ops; -@@ -3509,7 +3510,7 @@ static int bond_do_ioctl(struct net_devi +@@ -3502,7 +3503,7 @@ static int bond_do_ioctl(struct net_devi switch (cmd) { case BOND_ENSLAVE_OLD: case SIOCBONDENSLAVE: diff --git a/target/linux/layerscape/patches-4.14/817-platform-security-support-layerscape.patch b/target/linux/layerscape/patches-4.14/817-platform-security-support-layerscape.patch index 8f378d40ca..a9728cc05b 100644 --- a/target/linux/layerscape/patches-4.14/817-platform-security-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/817-platform-security-support-layerscape.patch @@ -103,7 +103,7 @@ Signed-off-by: Biwen Li + $ keyctl load secure kmk-master "load 'cat secure_key.blob'" @u --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -7645,6 +7645,18 @@ F: include/keys/trusted-type.h +@@ -7646,6 +7646,18 @@ F: include/keys/trusted-type.h F: security/keys/trusted.c F: security/keys/trusted.h