From 65044a50ab687274bcec79eb85ac7854f134129f Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 17 Dec 2018 14:30:40 +0100 Subject: kernel: bump 4.4 to 4.4.167 Refreshed all patches. Removed upstreamed: - 203-MIPS-ath79-fix-restart.patch - 330-Revert-MIPS-BCM47XX-Enable-74K-Core-ExternalSync-for.patch - 051-0001-ovl-rename-is_merge-to-is_lowest.patch - 051-0002-ovl-override-creds-with-the-ones-from-the-superblock.patch - 051-0005-ovl-proper-cleanup-of-workdir.patch Altered patches: - 201-extra_optimization.patch - 304-mips_disable_fpu.patch Compile-tested on: ar71xx, cns3xxx, imx6, mpc85xx Runtime-tested on: ar71xx, cns3xxx, imx6, mpc85xx Signed-off-by: Koen Vandeputte --- .../patches-4.4/0001-smsx95xx-fix-crimes-against-truesize.patch | 4 ++-- target/linux/brcm2708/patches-4.4/0029-Add-dwc_otg-driver.patch | 4 ++-- .../patches-4.4/0058-Allow-mac-address-to-be-set-in-smsc95xx.patch | 2 +- .../0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch | 4 ++-- .../0147-Updated-smsc95xx-driver-to-check-for-a-valid-MAC-add.patch | 4 ++-- .../0158-smsx95xx-Add-option-to-disable-the-crimes-against-tr.patch | 4 ++-- .../patches-4.4/0228-add-smsc95xx-packetsize-module_param.patch | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) (limited to 'target/linux/brcm2708') diff --git a/target/linux/brcm2708/patches-4.4/0001-smsx95xx-fix-crimes-against-truesize.patch b/target/linux/brcm2708/patches-4.4/0001-smsx95xx-fix-crimes-against-truesize.patch index fcf4eb36f8..2a2fc7ea71 100644 --- a/target/linux/brcm2708/patches-4.4/0001-smsx95xx-fix-crimes-against-truesize.patch +++ b/target/linux/brcm2708/patches-4.4/0001-smsx95xx-fix-crimes-against-truesize.patch @@ -15,7 +15,7 @@ Signed-off-by: Steve Glendinning --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c -@@ -1785,7 +1785,6 @@ static int smsc95xx_rx_fixup(struct usbn +@@ -1788,7 +1788,6 @@ static int smsc95xx_rx_fixup(struct usbn if (dev->net->features & NETIF_F_RXCSUM) smsc95xx_rx_csum_offload(skb); skb_trim(skb, skb->len - 4); /* remove fcs */ @@ -23,7 +23,7 @@ Signed-off-by: Steve Glendinning return 1; } -@@ -1803,7 +1802,6 @@ static int smsc95xx_rx_fixup(struct usbn +@@ -1806,7 +1805,6 @@ static int smsc95xx_rx_fixup(struct usbn if (dev->net->features & NETIF_F_RXCSUM) smsc95xx_rx_csum_offload(ax_skb); skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */ diff --git a/target/linux/brcm2708/patches-4.4/0029-Add-dwc_otg-driver.patch b/target/linux/brcm2708/patches-4.4/0029-Add-dwc_otg-driver.patch index 83c5453a0b..1651c55545 100644 --- a/target/linux/brcm2708/patches-4.4/0029-Add-dwc_otg-driver.patch +++ b/target/linux/brcm2708/patches-4.4/0029-Add-dwc_otg-driver.patch @@ -659,7 +659,7 @@ dwc_otg: Remove duplicate gadget probe/unregister function } --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5005,7 +5005,7 @@ static void port_event(struct usb_hub *h +@@ -5007,7 +5007,7 @@ static void port_event(struct usb_hub *h if (portchange & USB_PORT_STAT_C_OVERCURRENT) { u16 status = 0, unused; @@ -670,7 +670,7 @@ dwc_otg: Remove duplicate gadget probe/unregister function msleep(100); /* Cool down */ --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c -@@ -1913,6 +1913,85 @@ free_interfaces: +@@ -1924,6 +1924,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/brcm2708/patches-4.4/0058-Allow-mac-address-to-be-set-in-smsc95xx.patch b/target/linux/brcm2708/patches-4.4/0058-Allow-mac-address-to-be-set-in-smsc95xx.patch index 0d40acb3a6..85e55fbeae 100644 --- a/target/linux/brcm2708/patches-4.4/0058-Allow-mac-address-to-be-set-in-smsc95xx.patch +++ b/target/linux/brcm2708/patches-4.4/0058-Allow-mac-address-to-be-set-in-smsc95xx.patch @@ -29,7 +29,7 @@ Signed-off-by: popcornmix static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index, u32 *data, int in_pm) { -@@ -763,8 +768,59 @@ static int smsc95xx_ioctl(struct net_dev +@@ -766,8 +771,59 @@ static int smsc95xx_ioctl(struct net_dev return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL); } diff --git a/target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch b/target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch index f3f685aa61..ecc58f5814 100644 --- a/target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch +++ b/target/linux/brcm2708/patches-4.4/0061-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch @@ -10,7 +10,7 @@ Subject: [PATCH] config: Enable CONFIG_MEMCG, but leave it disabled (due to --- a/kernel/cgroup.c +++ b/kernel/cgroup.c -@@ -5311,7 +5311,7 @@ int __init cgroup_init_early(void) +@@ -5315,7 +5315,7 @@ int __init cgroup_init_early(void) return 0; } @@ -19,7 +19,7 @@ Subject: [PATCH] config: Enable CONFIG_MEMCG, but leave it disabled (due to /** * cgroup_init - cgroup initialization -@@ -5807,6 +5807,27 @@ static int __init cgroup_disable(char *s +@@ -5811,6 +5811,27 @@ static int __init cgroup_disable(char *s } __setup("cgroup_disable=", cgroup_disable); diff --git a/target/linux/brcm2708/patches-4.4/0147-Updated-smsc95xx-driver-to-check-for-a-valid-MAC-add.patch b/target/linux/brcm2708/patches-4.4/0147-Updated-smsc95xx-driver-to-check-for-a-valid-MAC-add.patch index 80dec72ff6..cb080c5bd2 100644 --- a/target/linux/brcm2708/patches-4.4/0147-Updated-smsc95xx-driver-to-check-for-a-valid-MAC-add.patch +++ b/target/linux/brcm2708/patches-4.4/0147-Updated-smsc95xx-driver-to-check-for-a-valid-MAC-add.patch @@ -13,7 +13,7 @@ meaning they don't end up with the same MAC address as the built-in RPi adaptor. --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c -@@ -817,10 +817,6 @@ static int smsc95xx_is_macaddr_param(str +@@ -820,10 +820,6 @@ static int smsc95xx_is_macaddr_param(str static void smsc95xx_init_mac_address(struct usbnet *dev) { @@ -24,7 +24,7 @@ meaning they don't end up with the same MAC address as the built-in RPi adaptor. /* try reading mac address from EEPROM */ if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN, dev->net->dev_addr) == 0) { -@@ -831,7 +827,11 @@ static void smsc95xx_init_mac_address(st +@@ -834,7 +830,11 @@ static void smsc95xx_init_mac_address(st } } diff --git a/target/linux/brcm2708/patches-4.4/0158-smsx95xx-Add-option-to-disable-the-crimes-against-tr.patch b/target/linux/brcm2708/patches-4.4/0158-smsx95xx-Add-option-to-disable-the-crimes-against-tr.patch index 74a531dd15..0596608309 100644 --- a/target/linux/brcm2708/patches-4.4/0158-smsx95xx-Add-option-to-disable-the-crimes-against-tr.patch +++ b/target/linux/brcm2708/patches-4.4/0158-smsx95xx-Add-option-to-disable-the-crimes-against-tr.patch @@ -24,7 +24,7 @@ See issue 1248. static char *macaddr = ":"; module_param(macaddr, charp, 0); MODULE_PARM_DESC(macaddr, "MAC address"); -@@ -1841,6 +1845,8 @@ static int smsc95xx_rx_fixup(struct usbn +@@ -1844,6 +1848,8 @@ static int smsc95xx_rx_fixup(struct usbn if (dev->net->features & NETIF_F_RXCSUM) smsc95xx_rx_csum_offload(skb); skb_trim(skb, skb->len - 4); /* remove fcs */ @@ -33,7 +33,7 @@ See issue 1248. return 1; } -@@ -1858,6 +1864,8 @@ static int smsc95xx_rx_fixup(struct usbn +@@ -1861,6 +1867,8 @@ static int smsc95xx_rx_fixup(struct usbn if (dev->net->features & NETIF_F_RXCSUM) smsc95xx_rx_csum_offload(ax_skb); skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */ diff --git a/target/linux/brcm2708/patches-4.4/0228-add-smsc95xx-packetsize-module_param.patch b/target/linux/brcm2708/patches-4.4/0228-add-smsc95xx-packetsize-module_param.patch index fd0dc41e4a..5f3dabc148 100644 --- a/target/linux/brcm2708/patches-4.4/0228-add-smsc95xx-packetsize-module_param.patch +++ b/target/linux/brcm2708/patches-4.4/0228-add-smsc95xx-packetsize-module_param.patch @@ -21,7 +21,7 @@ Signed-off-by: Sam Nazarko static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index, u32 *data, int in_pm) { -@@ -1006,13 +1010,13 @@ static int smsc95xx_reset(struct usbnet +@@ -1009,13 +1013,13 @@ static int smsc95xx_reset(struct usbnet if (!turbo_mode) { burst_cap = 0; -- cgit v1.2.3