[OpenWrt-Devel] [PATCH 1/2] kernel: bump 4.9 to 4.9.110
John Crispin
john at phrozen.org
Wed Jun 27 17:06:32 EDT 2018
gawd, merging your patches is becoming a drag ....
On 27/06/18 22:21, Koen Vandeputte wrote:
> Refreshed all patches
>
> Compile-tested on: ar71xx
> Runtime-tested on: ar71xx
>
> Signed-off-by: Koen Vandeputte <koen.vandeputte at ncentric.com>
> ---
> include/kernel-version.mk | 4 ++--
> .../ar71xx/patches-4.9/500-MIPS-fw-myloader.patch | 2 +-
> .../generic/pending-4.9/308-mips32r2_tune.patch | 2 +-
> ...rejecting-with-source-address-failed-policy.patch | 20 ++++++++++----------
> .../generic/pending-4.9/834-ledtrig-libata.patch | 8 ++++----
> 5 files changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/include/kernel-version.mk b/include/kernel-version.mk
> index 52a8433ec6cb..3ab0316056e4 100644
> --- a/include/kernel-version.mk
> +++ b/include/kernel-version.mk
> @@ -4,13 +4,13 @@ LINUX_RELEASE?=1
>
> LINUX_VERSION-3.18 = .71
> LINUX_VERSION-4.4 = .121
> -LINUX_VERSION-4.9 = .109
> LINUX_VERSION-4.14 = .51
> +LINUX_VERSION-4.9 = .110
>
> LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
> LINUX_KERNEL_HASH-4.4.121 = 44a88268b5088dc326b30c9b9133ac35a9a200b636b7268d08f32abeae6ca729
> -LINUX_KERNEL_HASH-4.9.109 = 3dcd5654a553432119492b69e649c4ed117781bfd571edcb02346c945be359b0
> LINUX_KERNEL_HASH-4.14.51 = dab2402baa2444348f9b3c354e8f65382a466d1766942a57441209f9a2df972b
> +LINUX_KERNEL_HASH-4.9.110 = 379a143a70a79f0eea6c9f6638942b65e6043abdde17ad23264c0abd93c4ea7a
>
> remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
> sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
> diff --git a/target/linux/ar71xx/patches-4.9/500-MIPS-fw-myloader.patch b/target/linux/ar71xx/patches-4.9/500-MIPS-fw-myloader.patch
> index 301422a7d8a1..304fd69b2262 100644
> --- a/target/linux/ar71xx/patches-4.9/500-MIPS-fw-myloader.patch
> +++ b/target/linux/ar71xx/patches-4.9/500-MIPS-fw-myloader.patch
> @@ -1,6 +1,6 @@
> --- a/arch/mips/Makefile
> +++ b/arch/mips/Makefile
> -@@ -213,6 +213,7 @@ cflags-$(toolchain-virt) += -DTOOLCHAIN
> +@@ -218,6 +218,7 @@ cflags-$(toolchain-virt) += -DTOOLCHAIN
> #
> libs-$(CONFIG_FW_ARC) += arch/mips/fw/arc/
> libs-$(CONFIG_FW_CFE) += arch/mips/fw/cfe/
> diff --git a/target/linux/generic/pending-4.9/308-mips32r2_tune.patch b/target/linux/generic/pending-4.9/308-mips32r2_tune.patch
> index 63cf576bd898..9e1efe2713e1 100644
> --- a/target/linux/generic/pending-4.9/308-mips32r2_tune.patch
> +++ b/target/linux/generic/pending-4.9/308-mips32r2_tune.patch
> @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
>
> --- a/arch/mips/Makefile
> +++ b/arch/mips/Makefile
> -@@ -148,7 +148,7 @@ cflags-$(CONFIG_CPU_R4X00) += -march=r46
> +@@ -153,7 +153,7 @@ cflags-$(CONFIG_CPU_R4X00) += -march=r46
> cflags-$(CONFIG_CPU_TX49XX) += -march=r4600 -Wa,--trap
> cflags-$(CONFIG_CPU_MIPS32_R1) += $(call cc-option,-march=mips32,-mips32 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \
> -Wa,-mips32 -Wa,--trap
> diff --git a/target/linux/generic/pending-4.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/pending-4.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
> index 2cebf55a447b..4757e81ea114 100644
> --- a/target/linux/generic/pending-4.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
> +++ b/target/linux/generic/pending-4.9/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
> @@ -141,7 +141,7 @@ Signed-off-by: Jonas Gorski <jogo at openwrt.org>
> static const struct rt6_info ip6_blk_hole_entry_template = {
> .dst = {
> .__refcnt = ATOMIC_INIT(1),
> -@@ -1970,6 +1987,11 @@ static struct rt6_info *ip6_route_info_c
> +@@ -1967,6 +1984,11 @@ static struct rt6_info *ip6_route_info_c
> rt->dst.output = ip6_pkt_prohibit_out;
> rt->dst.input = ip6_pkt_prohibit;
> break;
> @@ -153,7 +153,7 @@ Signed-off-by: Jonas Gorski <jogo at openwrt.org>
> case RTN_THROW:
> case RTN_UNREACHABLE:
> default:
> -@@ -2613,6 +2635,17 @@ static int ip6_pkt_prohibit_out(struct n
> +@@ -2610,6 +2632,17 @@ static int ip6_pkt_prohibit_out(struct n
> return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
> }
>
> @@ -171,7 +171,7 @@ Signed-off-by: Jonas Gorski <jogo at openwrt.org>
> /*
> * Allocate a dst for local (unicast / anycast) address.
> */
> -@@ -2850,7 +2883,8 @@ static int rtm_to_fib6_config(struct sk_
> +@@ -2847,7 +2880,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 ||
> @@ -181,7 +181,7 @@ Signed-off-by: Jonas Gorski <jogo at openwrt.org>
> cfg->fc_flags |= RTF_REJECT;
>
> if (rtm->rtm_type == RTN_LOCAL)
> -@@ -3222,6 +3256,9 @@ static int rt6_fill_node(struct net *net
> +@@ -3219,6 +3253,9 @@ static int rt6_fill_node(struct net *net
> case -EACCES:
> rtm->rtm_type = RTN_PROHIBIT;
> break;
> @@ -191,7 +191,7 @@ Signed-off-by: Jonas Gorski <jogo at openwrt.org>
> case -EAGAIN:
> rtm->rtm_type = RTN_THROW;
> break;
> -@@ -3498,6 +3535,8 @@ static int ip6_route_dev_notify(struct n
> +@@ -3495,6 +3532,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);
> @@ -200,7 +200,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
> -@@ -3509,6 +3548,7 @@ static int ip6_route_dev_notify(struct n
> +@@ -3506,6 +3545,7 @@ static int ip6_route_dev_notify(struct n
> in6_dev_put(net->ipv6.ip6_null_entry->rt6i_idev);
> #ifdef CONFIG_IPV6_MULTIPLE_TABLES
> in6_dev_put(net->ipv6.ip6_prohibit_entry->rt6i_idev);
> @@ -208,7 +208,7 @@ Signed-off-by: Jonas Gorski <jogo at openwrt.org>
> in6_dev_put(net->ipv6.ip6_blk_hole_entry->rt6i_idev);
> #endif
> }
> -@@ -3724,6 +3764,17 @@ static int __net_init ip6_route_net_init
> +@@ -3721,6 +3761,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);
> @@ -226,7 +226,7 @@ Signed-off-by: Jonas Gorski <jogo at openwrt.org>
> #endif
>
> net->ipv6.sysctl.flush_delay = 0;
> -@@ -3742,6 +3793,8 @@ out:
> +@@ -3739,6 +3790,8 @@ out:
> return ret;
>
> #ifdef CONFIG_IPV6_MULTIPLE_TABLES
> @@ -235,7 +235,7 @@ Signed-off-by: Jonas Gorski <jogo at openwrt.org>
> out_ip6_prohibit_entry:
> kfree(net->ipv6.ip6_prohibit_entry);
> out_ip6_null_entry:
> -@@ -3759,6 +3812,7 @@ static void __net_exit ip6_route_net_exi
> +@@ -3756,6 +3809,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);
> @@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <jogo at openwrt.org>
> #endif
> dst_entries_destroy(&net->ipv6.ip6_dst_ops);
> }
> -@@ -3832,6 +3886,9 @@ void __init ip6_route_init_special_entri
> +@@ -3829,6 +3883,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/pending-4.9/834-ledtrig-libata.patch b/target/linux/generic/pending-4.9/834-ledtrig-libata.patch
> index 78255a9550a5..4b319bd39949 100644
> --- a/target/linux/generic/pending-4.9/834-ledtrig-libata.patch
> +++ b/target/linux/generic/pending-4.9/834-ledtrig-libata.patch
> @@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
> /**
> * ata_build_rw_tf - Build ATA taskfile for given read/write request
> * @tf: Target ATA taskfile
> -@@ -4994,6 +5007,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
> +@@ -4991,6 +5004,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
> if (tag < 0)
> return NULL;
> }
> @@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
>
> qc = __ata_qc_from_tag(ap, tag);
> qc->tag = tag;
> -@@ -5895,6 +5911,9 @@ struct ata_port *ata_port_alloc(struct a
> +@@ -5892,6 +5908,9 @@ struct ata_port *ata_port_alloc(struct a
> ap->stats.unhandled_irq = 1;
> ap->stats.idle_irq = 1;
> #endif
> @@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
> ata_sff_port_init(ap);
>
> return ap;
> -@@ -5916,6 +5935,12 @@ static void ata_host_release(struct devi
> +@@ -5913,6 +5932,12 @@ static void ata_host_release(struct devi
>
> kfree(ap->pmp_link);
> kfree(ap->slave_link);
> @@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
> kfree(ap);
> host->ports[i] = NULL;
> }
> -@@ -6362,7 +6387,23 @@ int ata_host_register(struct ata_host *h
> +@@ -6359,7 +6384,23 @@ int ata_host_register(struct ata_host *h
> host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
> host->ports[i]->local_port_no = i + 1;
> }
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
More information about the openwrt-devel
mailing list