From fdcf353bdb56e994be8b55bef69596c9b92753cc Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 12 Sep 2020 18:48:56 +0800 Subject: [PATCH] kernel: bump 4.9 to 4.9.236 Refreshed all patches. Signed-off-by: CN_SZTL --- include/kernel-version.mk | 4 ++-- .../680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 8 ++++---- .../linux/generic/pending-4.9/834-ledtrig-libata.patch | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index a80ef44a92..8e25563b20 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,11 +6,11 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.9 = .235 +LINUX_VERSION-4.9 = .236 LINUX_VERSION-4.14 = .196 LINUX_VERSION-4.19 = .143 -LINUX_KERNEL_HASH-4.9.235 = e625a6212695efe5deeab5844e47404841fb1bf755f85eba818614c2ff580cc3 +LINUX_KERNEL_HASH-4.9.236 = e7e26082c17a2a9ca5cfcc4c69c9a1966e0e1c12aaef117ff798f8b52df842d5 LINUX_KERNEL_HASH-4.14.196 = 5e61b2f58d4c930c3567821aeeb6f688554dca61454646d54711bfc9abc7b09a LINUX_KERNEL_HASH-4.19.143 = 2a4335c66f0ea8cc49d89ab25e5e00d75fcb33fe638d5584855598b4b8f3038d diff --git a/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index d0d2d15b4c..ae66804e67 100644 --- a/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau if (!(skb->dev->features & NETIF_F_GRO)) goto normal; -@@ -5873,6 +5876,48 @@ static void __netdev_adjacent_dev_unlink +@@ -5874,6 +5877,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -93,7 +93,7 @@ Signed-off-by: Felix Fietkau static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info) -@@ -5945,6 +5990,7 @@ static int __netdev_upper_dev_link(struc +@@ -5946,6 +5991,7 @@ static int __netdev_upper_dev_link(struc goto rollback_lower_mesh; } @@ -101,7 +101,7 @@ Signed-off-by: Felix Fietkau ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -6071,6 +6117,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -6072,6 +6118,7 @@ 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); @@ -109,7 +109,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); } -@@ -6674,6 +6721,7 @@ int dev_set_mac_address(struct net_devic +@@ -6675,6 +6722,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; 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 a369c7166e..062e9fac72 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 /** * ata_build_rw_tf - Build ATA taskfile for given read/write request * @tf: Target ATA taskfile -@@ -4997,6 +5010,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -4996,6 +5009,9 @@ struct ata_queued_cmd *ata_qc_new_init(s if (tag < 0) return NULL; } @@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle qc = __ata_qc_from_tag(ap, tag); qc->tag = tag; -@@ -5898,6 +5914,9 @@ struct ata_port *ata_port_alloc(struct a +@@ -5897,6 +5913,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 ata_sff_port_init(ap); return ap; -@@ -5919,6 +5938,12 @@ static void ata_host_release(struct devi +@@ -5918,6 +5937,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 kfree(ap); host->ports[i] = NULL; } -@@ -6365,7 +6390,23 @@ int ata_host_register(struct ata_host *h +@@ -6364,7 +6389,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; } @@ -134,7 +134,7 @@ Signed-off-by: Daniel Golle /* * Define if arch has non-standard setup. This is a _PCI_ standard -@@ -887,6 +890,12 @@ struct ata_port { +@@ -888,6 +891,12 @@ struct ata_port { #ifdef CONFIG_ATA_ACPI struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */ #endif