[LEDE-DEV] [PATCH] kernel: bump kernel 4.4 to 4.4.131 for 17.01
John Crispin
john at phrozen.org
Fri May 4 06:53:40 PDT 2018
Hi,
i am afraid you need to refresh once more, fails to apply since the ipv6
fix to patch 670
John
On 03/05/18 21:00, Etienne Haarsma wrote:
> * Refreshed patches
>
> Compile-tested: ar71xx
> Run-tested: ar71xx
>
> Signed-off-by: Etienne Haarsma <bladeoner112 at gmail.com>
> ---
> include/kernel-version.mk | 4 ++--
> ...03-mtd_fix_cfi_cmdset_0002_status_check.patch | 14 +++++++-------
> ...11-mtd-cfi_cmdset_0002-force-word-write.patch | 6 +++---
> .../patches-4.4/0029-Add-dwc_otg-driver.patch | 2 +-
> ...mdset_0002-add-buffer-write-cmd-timeout.patch | 2 +-
> .../patches-4.4/630-packet_socket_type.patch | 16 ++++++++--------
> ...cting-with-source-address-failed-policy.patch | 14 +++++++-------
> ...-fix-cfi-cmdset-0002-erase-status-check.patch | 4 ++--
> ...37-mtd-cfi-cmdset-0002-force-word-write.patch | 6 +++---
> 9 files changed, 34 insertions(+), 34 deletions(-)
>
> diff --git a/include/kernel-version.mk b/include/kernel-version.mk
> index 5f2f87a4af..f10bbcabbc 100644
> --- a/include/kernel-version.mk
> +++ b/include/kernel-version.mk
> @@ -3,10 +3,10 @@
> LINUX_RELEASE?=1
>
> LINUX_VERSION-3.18 = .43
> -LINUX_VERSION-4.4 = .129
> +LINUX_VERSION-4.4 = .131
>
> LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c
> -LINUX_KERNEL_HASH-4.4.129 = a165c4bada6a8d2355727ef6c97669e8c87c48f28bb410af34741c87fcf4712b
> +LINUX_KERNEL_HASH-4.4.131 = 65127add35c45acda866d10860e80bfdcc19b6c21e30e5dc9b92020a44d7c709
>
> ifdef KERNEL_PATCHVER
> LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
> diff --git a/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch
> index 1ccce4ecec..8f41d9432c 100644
> --- a/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch
> +++ b/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch
> @@ -1,6 +1,6 @@
> --- a/drivers/mtd/chips/cfi_cmdset_0002.c
> +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
> -@@ -1632,8 +1632,8 @@ static int __xipram do_write_oneword(str
> +@@ -1633,8 +1633,8 @@ static int __xipram do_write_oneword(str
> break;
> }
>
> @@ -11,7 +11,7 @@
>
> /* Latency issues. Drop the lock, wait a while and retry */
> UDELAY(map, chip, adr, 1);
> -@@ -1649,6 +1649,8 @@ static int __xipram do_write_oneword(str
> +@@ -1650,6 +1650,8 @@ static int __xipram do_write_oneword(str
>
> ret = -EIO;
> }
> @@ -20,7 +20,7 @@
> xip_enable(map, chip, adr);
> op_done:
> if (mode == FL_OTP_WRITE)
> -@@ -2227,7 +2229,6 @@ static int cfi_amdstd_panic_write(struct
> +@@ -2228,7 +2230,6 @@ static int cfi_amdstd_panic_write(struct
> return 0;
> }
>
> @@ -28,7 +28,7 @@
> /*
> * Handle devices with one erase region, that only implement
> * the chip erase command.
> -@@ -2291,8 +2292,8 @@ static int __xipram do_erase_chip(struct
> +@@ -2293,8 +2294,8 @@ static int __xipram do_erase_chip(struct
> chip->erase_suspended = 0;
> }
>
> @@ -39,7 +39,7 @@
>
> if (time_after(jiffies, timeo)) {
> printk(KERN_WARNING "MTD %s(): software timeout\n",
> -@@ -2312,6 +2313,7 @@ static int __xipram do_erase_chip(struct
> +@@ -2314,6 +2315,7 @@ static int __xipram do_erase_chip(struct
> ret = -EIO;
> }
>
> @@ -47,7 +47,7 @@
> chip->state = FL_READY;
> xip_enable(map, chip, adr);
> DISABLE_VPP(map);
> -@@ -2380,9 +2382,9 @@ static int __xipram do_erase_oneblock(st
> +@@ -2383,9 +2385,9 @@ static int __xipram do_erase_oneblock(st
> chip->erase_suspended = 0;
> }
>
> @@ -59,7 +59,7 @@
> }
>
> if (time_after(jiffies, timeo)) {
> -@@ -2404,6 +2406,7 @@ static int __xipram do_erase_oneblock(st
> +@@ -2407,6 +2409,7 @@ static int __xipram do_erase_oneblock(st
> ret = -EIO;
> }
>
> diff --git a/target/linux/ar71xx/patches-4.4/411-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ar71xx/patches-4.4/411-mtd-cfi_cmdset_0002-force-word-write.patch
> index 39c5478182..28c6ad875d 100644
> --- a/target/linux/ar71xx/patches-4.4/411-mtd-cfi_cmdset_0002-force-word-write.patch
> +++ b/target/linux/ar71xx/patches-4.4/411-mtd-cfi_cmdset_0002-force-word-write.patch
> @@ -35,7 +35,7 @@
>
> /* Atmel chips don't use the same PRI format as AMD chips */
> static void fixup_convert_atmel_pri(struct mtd_info *mtd)
> -@@ -1791,6 +1795,7 @@ static int cfi_amdstd_write_words(struct
> +@@ -1792,6 +1796,7 @@ static int cfi_amdstd_write_words(struct
> /*
> * FIXME: interleaved mode not tested, and probably not supported!
> */
> @@ -43,7 +43,7 @@
> static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
> unsigned long adr, const u_char *buf,
> int len)
> -@@ -1919,7 +1924,6 @@ static int __xipram do_write_buffer(stru
> +@@ -1920,7 +1925,6 @@ static int __xipram do_write_buffer(stru
> return ret;
> }
>
> @@ -51,7 +51,7 @@
> static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
> size_t *retlen, const u_char *buf)
> {
> -@@ -1994,6 +1998,7 @@ static int cfi_amdstd_write_buffers(stru
> +@@ -1995,6 +1999,7 @@ static int cfi_amdstd_write_buffers(stru
>
> return 0;
> }
> 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 b94c0e0e06..75fd16d7f4 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
> -@@ -4987,7 +4987,7 @@ static void port_event(struct usb_hub *h
> +@@ -4995,7 +4995,7 @@ static void port_event(struct usb_hub *h
> if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
> u16 status = 0, unused;
>
> diff --git a/target/linux/generic/patches-4.4/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch b/target/linux/generic/patches-4.4/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
> index c437a140f0..382b44a939 100644
> --- a/target/linux/generic/patches-4.4/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
> +++ b/target/linux/generic/patches-4.4/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
> @@ -8,7 +8,7 @@ Signed-off-by: George Kashperko <george at znau.edu.ua>
> 1 file changed, 1 insertion(+)
> --- a/drivers/mtd/chips/cfi_cmdset_0002.c
> +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
> -@@ -1830,6 +1830,7 @@ static int __xipram do_write_buffer(stru
> +@@ -1831,6 +1831,7 @@ static int __xipram do_write_buffer(stru
>
> /* Write Buffer Load */
> map_write(map, CMD(0x25), cmd_adr);
> diff --git a/target/linux/generic/patches-4.4/630-packet_socket_type.patch b/target/linux/generic/patches-4.4/630-packet_socket_type.patch
> index 0314938ac4..f3fe51fc8e 100644
> --- a/target/linux/generic/patches-4.4/630-packet_socket_type.patch
> +++ b/target/linux/generic/patches-4.4/630-packet_socket_type.patch
> @@ -26,7 +26,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
> #define PACKET_FANOUT_LB 1
> --- a/net/packet/af_packet.c
> +++ b/net/packet/af_packet.c
> -@@ -1777,6 +1777,7 @@ static int packet_rcv_spkt(struct sk_buf
> +@@ -1784,6 +1784,7 @@ static int packet_rcv_spkt(struct sk_buf
> {
> struct sock *sk;
> struct sockaddr_pkt *spkt;
> @@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
>
> /*
> * When we registered the protocol we saved the socket in the data
> -@@ -1784,6 +1785,7 @@ static int packet_rcv_spkt(struct sk_buf
> +@@ -1791,6 +1792,7 @@ static int packet_rcv_spkt(struct sk_buf
> */
>
> sk = pt->af_packet_priv;
> @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
>
> /*
> * Yank back the headers [hope the device set this
> -@@ -1796,7 +1798,7 @@ static int packet_rcv_spkt(struct sk_buf
> +@@ -1803,7 +1805,7 @@ static int packet_rcv_spkt(struct sk_buf
> * so that this procedure is noop.
> */
>
> @@ -51,7 +51,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
> goto out;
>
> if (!net_eq(dev_net(dev), sock_net(sk)))
> -@@ -1999,12 +2001,12 @@ static int packet_rcv(struct sk_buff *sk
> +@@ -2006,12 +2008,12 @@ static int packet_rcv(struct sk_buff *sk
> int skb_len = skb->len;
> unsigned int snaplen, res;
>
> @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
> if (!net_eq(dev_net(dev), sock_net(sk)))
> goto drop;
>
> -@@ -2124,12 +2126,12 @@ static int tpacket_rcv(struct sk_buff *s
> +@@ -2131,12 +2133,12 @@ static int tpacket_rcv(struct sk_buff *s
> BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32);
> BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48);
>
> @@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
> if (!net_eq(dev_net(dev), sock_net(sk)))
> goto drop;
>
> -@@ -3126,6 +3128,7 @@ static int packet_create(struct net *net
> +@@ -3135,6 +3137,7 @@ static int packet_create(struct net *net
> mutex_init(&po->pg_vec_lock);
> po->rollover = NULL;
> po->prot_hook.func = packet_rcv;
> @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
>
> if (sock->type == SOCK_PACKET)
> po->prot_hook.func = packet_rcv_spkt;
> -@@ -3755,6 +3758,16 @@ packet_setsockopt(struct socket *sock, i
> +@@ -3793,6 +3796,16 @@ packet_setsockopt(struct socket *sock, i
> po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
> return 0;
> }
> @@ -108,7 +108,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
> default:
> return -ENOPROTOOPT;
> }
> -@@ -3807,6 +3820,13 @@ static int packet_getsockopt(struct sock
> +@@ -3845,6 +3858,13 @@ static int packet_getsockopt(struct sock
> case PACKET_VNET_HDR:
> val = po->has_vnet_hdr;
> break;
> diff --git a/target/linux/generic/patches-4.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/patches-4.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
> index 2505be10d2..ae8036b9ec 100644
> --- a/target/linux/generic/patches-4.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
> +++ b/target/linux/generic/patches-4.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
> @@ -173,7 +173,7 @@ Signed-off-by: Jonas Gorski <jogo at openwrt.org>
> /*
> * Allocate a dst for local (unicast / anycast) address.
> */
> -@@ -2747,7 +2780,8 @@ static int rtm_to_fib6_config(struct sk_
> +@@ -2749,7 +2782,8 @@ static int rtm_to_fib6_config(struct sk_
> if (rtm->rtm_type == RTN_UNREACHABLE ||
> rtm->rtm_type == RTN_BLACKHOLE ||
> rtm->rtm_type == RTN_PROHIBIT ||
> @@ -183,7 +183,7 @@ Signed-off-by: Jonas Gorski <jogo at openwrt.org>
> cfg->fc_flags |= RTF_REJECT;
>
> if (rtm->rtm_type == RTN_LOCAL)
> -@@ -3100,6 +3134,9 @@ static int rt6_fill_node(struct net *net
> +@@ -3102,6 +3136,9 @@ static int rt6_fill_node(struct net *net
> case -EACCES:
> rtm->rtm_type = RTN_PROHIBIT;
> break;
> @@ -193,7 +193,7 @@ Signed-off-by: Jonas Gorski <jogo at openwrt.org>
> case -EAGAIN:
> rtm->rtm_type = RTN_THROW;
> break;
> -@@ -3379,6 +3416,8 @@ static int ip6_route_dev_notify(struct n
> +@@ -3381,6 +3418,8 @@ static int ip6_route_dev_notify(struct n
> #ifdef CONFIG_IPV6_MULTIPLE_TABLES
> net->ipv6.ip6_prohibit_entry->dst.dev = dev;
> net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
> @@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski <jogo at openwrt.org>
> net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
> net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
> #endif
> -@@ -3605,6 +3644,17 @@ static int __net_init ip6_route_net_init
> +@@ -3607,6 +3646,17 @@ static int __net_init ip6_route_net_init
> net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
> dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
> ip6_template_metrics, true);
> @@ -220,7 +220,7 @@ Signed-off-by: Jonas Gorski <jogo at openwrt.org>
> #endif
>
> net->ipv6.sysctl.flush_delay = 0;
> -@@ -3623,6 +3673,8 @@ out:
> +@@ -3625,6 +3675,8 @@ out:
> return ret;
>
> #ifdef CONFIG_IPV6_MULTIPLE_TABLES
> @@ -229,7 +229,7 @@ Signed-off-by: Jonas Gorski <jogo at openwrt.org>
> out_ip6_prohibit_entry:
> kfree(net->ipv6.ip6_prohibit_entry);
> out_ip6_null_entry:
> -@@ -3640,6 +3692,7 @@ static void __net_exit ip6_route_net_exi
> +@@ -3642,6 +3694,7 @@ static void __net_exit ip6_route_net_exi
> #ifdef CONFIG_IPV6_MULTIPLE_TABLES
> kfree(net->ipv6.ip6_prohibit_entry);
> kfree(net->ipv6.ip6_blk_hole_entry);
> @@ -237,7 +237,7 @@ Signed-off-by: Jonas Gorski <jogo at openwrt.org>
> #endif
> dst_entries_destroy(&net->ipv6.ip6_dst_ops);
> }
> -@@ -3713,6 +3766,9 @@ void __init ip6_route_init_special_entri
> +@@ -3715,6 +3768,9 @@ void __init ip6_route_init_special_entri
> init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
> init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
> init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
> diff --git a/target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch b/target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch
> index b6189fe096..1bcad6d2bd 100644
> --- a/target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch
> +++ b/target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch
> @@ -9,7 +9,7 @@ Subject: [PATCH 36/53] mtd: fix cfi cmdset 0002 erase status check
>
> --- a/drivers/mtd/chips/cfi_cmdset_0002.c
> +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
> -@@ -2291,7 +2291,7 @@ static int __xipram do_erase_chip(struct
> +@@ -2293,7 +2293,7 @@ static int __xipram do_erase_chip(struct
> chip->erase_suspended = 0;
> }
>
> @@ -18,7 +18,7 @@ Subject: [PATCH 36/53] mtd: fix cfi cmdset 0002 erase status check
> break;
>
> if (time_after(jiffies, timeo)) {
> -@@ -2380,7 +2380,7 @@ static int __xipram do_erase_oneblock(st
> +@@ -2383,7 +2383,7 @@ static int __xipram do_erase_oneblock(st
> chip->erase_suspended = 0;
> }
>
> diff --git a/target/linux/ramips/patches-4.4/0037-mtd-cfi-cmdset-0002-force-word-write.patch b/target/linux/ramips/patches-4.4/0037-mtd-cfi-cmdset-0002-force-word-write.patch
> index 8f274bca15..f6b05a56e7 100644
> --- a/target/linux/ramips/patches-4.4/0037-mtd-cfi-cmdset-0002-force-word-write.patch
> +++ b/target/linux/ramips/patches-4.4/0037-mtd-cfi-cmdset-0002-force-word-write.patch
> @@ -44,7 +44,7 @@ Subject: [PATCH 37/53] mtd: cfi cmdset 0002 force word write
>
> /* Atmel chips don't use the same PRI format as AMD chips */
> static void fixup_convert_atmel_pri(struct mtd_info *mtd)
> -@@ -1789,6 +1793,7 @@ static int cfi_amdstd_write_words(struct
> +@@ -1790,6 +1794,7 @@ static int cfi_amdstd_write_words(struct
> /*
> * FIXME: interleaved mode not tested, and probably not supported!
> */
> @@ -52,7 +52,7 @@ Subject: [PATCH 37/53] mtd: cfi cmdset 0002 force word write
> static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
> unsigned long adr, const u_char *buf,
> int len)
> -@@ -1917,7 +1922,6 @@ static int __xipram do_write_buffer(stru
> +@@ -1918,7 +1923,6 @@ static int __xipram do_write_buffer(stru
> return ret;
> }
>
> @@ -60,7 +60,7 @@ Subject: [PATCH 37/53] mtd: cfi cmdset 0002 force word write
> static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
> size_t *retlen, const u_char *buf)
> {
> -@@ -1992,6 +1996,7 @@ static int cfi_amdstd_write_buffers(stru
> +@@ -1993,6 +1997,7 @@ static int cfi_amdstd_write_buffers(stru
>
> return 0;
> }
More information about the Lede-dev
mailing list