From 21762fe9d628acfdaa63d3d6ba2613e97bccb379 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Thu, 31 Jan 2019 16:36:37 +0100 Subject: [PATCH] kernel: bump 4.9 to 4.9.154 Refreshed all patches. Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 ++-- .../backport-4.9/021-bridge-multicast-to-unicast.patch | 4 ++-- target/linux/generic/hack-4.9/641-bridge_port_isolate.patch | 4 ++-- .../linux/generic/hack-4.9/661-use_fq_codel_by_default.patch | 2 +- target/linux/generic/hack-4.9/902-debloat_proc.patch | 4 ++-- ...v6-allow-rejecting-with-source-address-failed-policy.patch | 2 +- target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch | 4 ++-- .../patches-4.9/202-core-linux-support-layerscape.patch | 2 +- .../patches-4.9/811-irqchip-support-layerscape.patch | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index be794183fa..20e0ca03fa 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -2,10 +2,10 @@ LINUX_RELEASE?=1 -LINUX_VERSION-4.9 = .153 +LINUX_VERSION-4.9 = .154 LINUX_VERSION-4.14 = .96 -LINUX_KERNEL_HASH-4.9.153 = 9066929ec2550794ae107350a5f3c5b648438aa915cfc62bac5b7a54b9d7731a +LINUX_KERNEL_HASH-4.9.154 = 5b314f1ac16f78e10acea0053f0c758e696b28f80272064e0a06bc69dc9d5696 LINUX_KERNEL_HASH-4.14.96 = 110daeae1a416b7e0ec8dce5e86d67552deeb4567f696c3869389be239f0ecb5 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch b/target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch index 7c36a767c7..4b7e8ba75a 100644 --- a/target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch +++ b/target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch @@ -51,7 +51,7 @@ Signed-off-by: Linus Lüssing #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c -@@ -174,6 +174,29 @@ out: +@@ -173,6 +173,29 @@ out: return p; } @@ -81,7 +81,7 @@ Signed-off-by: Linus Lüssing /* called under rcu_read_lock */ void br_flood(struct net_bridge *br, struct sk_buff *skb, enum br_pkt_type pkt_type, bool local_rcv, bool local_orig) -@@ -242,10 +265,20 @@ void br_multicast_flood(struct net_bridg +@@ -241,10 +264,20 @@ void br_multicast_flood(struct net_bridg rport = rp ? hlist_entry(rp, struct net_bridge_port, rlist) : NULL; diff --git a/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch b/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch index c545fa17ef..a436dd2b1e 100644 --- a/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch +++ b/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch @@ -25,7 +25,7 @@ Signed-off-by: Felix Fietkau --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c -@@ -141,6 +141,9 @@ static int deliver_clone(const struct ne +@@ -140,6 +140,9 @@ static int deliver_clone(const struct ne void br_forward(const struct net_bridge_port *to, struct sk_buff *skb, bool local_rcv, bool local_orig) { @@ -35,7 +35,7 @@ Signed-off-by: Felix Fietkau if (to && should_deliver(to, skb)) { if (local_rcv) deliver_clone(to, skb, local_orig); -@@ -206,6 +209,8 @@ void br_flood(struct net_bridge *br, str +@@ -205,6 +208,8 @@ void br_flood(struct net_bridge *br, str struct net_bridge_port *p; list_for_each_entry_rcu(p, &br->port_list, list) { diff --git a/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch index 981170cbb1..34fc2a37c3 100644 --- a/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch +++ b/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch @@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau device, it has to decide which ones to send first, which ones to --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c -@@ -1978,7 +1978,7 @@ static int __init pktsched_init(void) +@@ -1977,7 +1977,7 @@ static int __init pktsched_init(void) return err; } diff --git a/target/linux/generic/hack-4.9/902-debloat_proc.patch b/target/linux/generic/hack-4.9/902-debloat_proc.patch index 5632d6ebda..91d1d28351 100644 --- a/target/linux/generic/hack-4.9/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.9/902-debloat_proc.patch @@ -339,7 +339,7 @@ Signed-off-by: Felix Fietkau --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c -@@ -2667,10 +2667,12 @@ static const struct file_operations fib_ +@@ -2677,10 +2677,12 @@ static const struct file_operations fib_ int __net_init fib_proc_init(struct net *net) { @@ -354,7 +354,7 @@ Signed-off-by: Felix Fietkau &fib_triestat_fops)) goto out2; -@@ -2680,17 +2682,21 @@ int __net_init fib_proc_init(struct net +@@ -2690,17 +2692,21 @@ int __net_init fib_proc_init(struct net return 0; out3: 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 fa8c3b75de..3f6b406cf2 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 @@ -66,7 +66,7 @@ Signed-off-by: Jonas Gorski static void rt_fibinfo_free(struct rtable __rcu **rtp) --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c -@@ -2396,6 +2396,7 @@ static const char *const rtn_type_names[ +@@ -2406,6 +2406,7 @@ static const char *const rtn_type_names[ [RTN_THROW] = "THROW", [RTN_NAT] = "NAT", [RTN_XRESOLVE] = "XRESOLVE", diff --git a/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch b/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch index 12df228516..4e13ec950c 100644 --- a/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch +++ b/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch @@ -18,7 +18,7 @@ uart->capabilities = up->capabilities; --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c -@@ -2250,6 +2250,7 @@ uart_report_port(struct uart_driver *drv +@@ -2254,6 +2254,7 @@ uart_report_port(struct uart_driver *drv snprintf(address, sizeof(address), "I/O 0x%lx offset 0x%x", port->iobase, port->hub6); break; @@ -26,7 +26,7 @@ case UPIO_MEM: case UPIO_MEM16: case UPIO_MEM32: -@@ -2914,6 +2915,7 @@ int uart_match_port(struct uart_port *po +@@ -2918,6 +2919,7 @@ int uart_match_port(struct uart_port *po case UPIO_HUB6: return (port1->iobase == port2->iobase) && (port1->hub6 == port2->hub6); diff --git a/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch index 517d144f3a..df15a882a0 100644 --- a/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch @@ -384,7 +384,7 @@ Signed-off-by: Yangbo Lu void __kfree_skb(struct sk_buff *skb); extern struct kmem_cache *skbuff_head_cache; -@@ -3081,6 +3082,7 @@ static inline void skb_free_datagram_loc +@@ -3082,6 +3083,7 @@ static inline void skb_free_datagram_loc } int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags); int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len); diff --git a/target/linux/layerscape/patches-4.9/811-irqchip-support-layerscape.patch b/target/linux/layerscape/patches-4.9/811-irqchip-support-layerscape.patch index 3a44f26432..ec1af3d92d 100644 --- a/target/linux/layerscape/patches-4.9/811-irqchip-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/811-irqchip-support-layerscape.patch @@ -25,7 +25,7 @@ Signed-off-by: Yangbo Lu +obj-$(CONFIG_QUICC_ENGINE) += irq-qeic.o --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c -@@ -1658,6 +1658,7 @@ static int its_init_domain(struct fwnode +@@ -1659,6 +1659,7 @@ static int its_init_domain(struct fwnode inner_domain->parent = its_parent; inner_domain->bus_token = DOMAIN_BUS_NEXUS; -- 2.25.1