[LEDE-DEV] [PATCH] kernel: update kernel 4.9 to 4.9.39

Baptiste Jonglez baptiste at bitsofnetworks.org
Mon Jul 24 12:27:28 PDT 2017


Hi Koen,

Just so you know, it's not the first time that there are several identical
submissions to bump the kernel version.  See this pull request that also
updates kernel to 4.9.39:

    https://github.com/lede-project/source/pull/1236

No need to duplicate time and efforts :)

Baptiste

On Mon, Jul 24, 2017 at 01:12:48PM +0200, Koen Vandeputte wrote:
> - Refreshed all patches
> 
> Compile tested on: cns3xxx, imx6
> Run tested on: cns3xxx, imx6
> 
> Signed-off-by: Koen Vandeputte <koen.vandeputte at ncentric.com>
> ---
>  include/kernel-version.mk                                    |  4 ++--
>  .../patches-4.9/021-bridge-multicast-to-unicast.patch        |  2 +-
>  .../generic/patches-4.9/661-use_fq_codel_by_default.patch    |  2 +-
>  ...6-allow-rejecting-with-source-address-failed-policy.patch | 12 ++++++------
>  .../680-NET-skip-GRO-for-foreign-MAC-addresses.patch         |  6 +++---
>  5 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/include/kernel-version.mk b/include/kernel-version.mk
> index 3033060..7df6999 100644
> --- a/include/kernel-version.mk
> +++ b/include/kernel-version.mk
> @@ -4,11 +4,11 @@ LINUX_RELEASE?=1
>  
>  LINUX_VERSION-3.18 = .43
>  LINUX_VERSION-4.4 = .74
> -LINUX_VERSION-4.9 = .37
> +LINUX_VERSION-4.9 = .39
>  
>  LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c
>  LINUX_KERNEL_HASH-4.4.74 = c319ad6150d112bd4f8c9d1427868eeafd3ab461becf9457f814e4ba7c57808e
> -LINUX_KERNEL_HASH-4.9.37 = f61ecf083b690d97cfdeec2b4457992e98882250c4f41ade36fd7cdfda066090
> +LINUX_KERNEL_HASH-4.9.39 = 6e8cf7bb936fa8ce720d08ddb4d05a5d37093e1f8d6fe0bf73789c9eef1cfa31
>  
>  ifdef KERNEL_PATCHVER
>    LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
> diff --git a/target/linux/generic/patches-4.9/021-bridge-multicast-to-unicast.patch b/target/linux/generic/patches-4.9/021-bridge-multicast-to-unicast.patch
> index d3b4a62..1886b01 100644
> --- a/target/linux/generic/patches-4.9/021-bridge-multicast-to-unicast.patch
> +++ b/target/linux/generic/patches-4.9/021-bridge-multicast-to-unicast.patch
> @@ -106,7 +106,7 @@ Signed-off-by: Linus Lüssing <linus.luessing at c0d3.blue>
>   		if (prev == port)
>  --- a/net/bridge/br_mdb.c
>  +++ b/net/bridge/br_mdb.c
> -@@ -531,7 +531,7 @@ static int br_mdb_add_group(struct net_b
> +@@ -532,7 +532,7 @@ static int br_mdb_add_group(struct net_b
>   			break;
>   	}
>   
> diff --git a/target/linux/generic/patches-4.9/661-use_fq_codel_by_default.patch b/target/linux/generic/patches-4.9/661-use_fq_codel_by_default.patch
> index 50115e5..f94cca0 100644
> --- a/target/linux/generic/patches-4.9/661-use_fq_codel_by_default.patch
> +++ b/target/linux/generic/patches-4.9/661-use_fq_codel_by_default.patch
> @@ -69,7 +69,7 @@
>   		ops = &noqueue_qdisc_ops;
>  --- a/net/sched/sch_api.c
>  +++ b/net/sched/sch_api.c
> -@@ -1976,7 +1976,7 @@ static int __init pktsched_init(void)
> +@@ -1979,7 +1979,7 @@ static int __init pktsched_init(void)
>   		return err;
>   	}
>   
> diff --git a/target/linux/generic/patches-4.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/patches-4.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
> index 6062608..1c08785 100644
> --- a/target/linux/generic/patches-4.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
> +++ b/target/linux/generic/patches-4.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
> @@ -183,7 +183,7 @@ Signed-off-by: Jonas Gorski <jogo at openwrt.org>
>   		cfg->fc_flags |= RTF_REJECT;
>   
>   	if (rtm->rtm_type == RTN_LOCAL)
> -@@ -3213,6 +3247,9 @@ static int rt6_fill_node(struct net *net
> +@@ -3207,6 +3241,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;
> -@@ -3489,6 +3526,8 @@ static int ip6_route_dev_notify(struct n
> +@@ -3483,6 +3520,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
> -@@ -3711,6 +3750,17 @@ static int __net_init ip6_route_net_init
> +@@ -3705,6 +3744,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;
> -@@ -3729,6 +3779,8 @@ out:
> +@@ -3723,6 +3773,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:
> -@@ -3746,6 +3798,7 @@ static void __net_exit ip6_route_net_exi
> +@@ -3740,6 +3792,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);
>   }
> -@@ -3819,6 +3872,9 @@ void __init ip6_route_init_special_entri
> +@@ -3813,6 +3866,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/generic/patches-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/patches-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
> index 4d4ca6a..f77c03b 100644
> --- a/target/linux/generic/patches-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
> +++ b/target/linux/generic/patches-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
> @@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
>   	if (!(skb->dev->features & NETIF_F_GRO))
>   		goto normal;
>   
> -@@ -5790,6 +5793,48 @@ static void __netdev_adjacent_dev_unlink
> +@@ -5800,6 +5803,48 @@ static void __netdev_adjacent_dev_unlink
>   					   &upper_dev->adj_list.lower);
>   }
>   
> @@ -76,7 +76,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
>   static int __netdev_upper_dev_link(struct net_device *dev,
>   				   struct net_device *upper_dev, bool master,
>   				   void *upper_priv, void *upper_info)
> -@@ -5988,6 +6033,8 @@ void netdev_upper_dev_unlink(struct net_
> +@@ -5998,6 +6043,8 @@ void netdev_upper_dev_unlink(struct net_
>   	list_for_each_entry(i, &upper_dev->all_adj_list.upper, list)
>   		__netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr);
>   
> @@ -85,7 +85,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
>   	call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
>   				      &changeupper_info.info);
>   }
> -@@ -6588,6 +6635,7 @@ int dev_set_mac_address(struct net_devic
> +@@ -6598,6 +6645,7 @@ int dev_set_mac_address(struct net_devic
>   	if (err)
>   		return err;
>   	dev->addr_assign_type = NET_ADDR_SET;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/lede-dev/attachments/20170724/5dba7802/attachment.sig>


More information about the Lede-dev mailing list