From 0989b7ad3a38345bc09a535782884d78ec195c9d Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 23 Feb 2022 06:58:46 -0500 Subject: kernel: bump 5.10 to 5.10.102 Removed upstreamed: bcm4908/patches-5.10/180-i2c-brcmstb-fix-support-for-DSL-and-CM-variants.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.102&id=f333c1916fd6b55900029bf8f918cc00009e2111 Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia --- ...w-rejecting-with-source-address-failed-policy.patch | 2 +- ...bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch | 2 +- ...01-gpio-gpio-cascade-add-generic-GPIO-cascade.patch | 18 ++++-------------- .../generic/pending-5.10/834-ledtrig-libata.patch | 8 ++++---- 4 files changed, 10 insertions(+), 20 deletions(-) (limited to 'target/linux/generic') diff --git a/target/linux/generic/pending-5.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/pending-5.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch index 68edf37bf7..d85735531b 100644 --- a/target/linux/generic/pending-5.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch +++ b/target/linux/generic/pending-5.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch @@ -20,7 +20,7 @@ Signed-off-by: Jonas Gorski --- a/include/net/netns/ipv6.h +++ b/include/net/netns/ipv6.h -@@ -87,6 +87,7 @@ struct netns_ipv6 { +@@ -88,6 +88,7 @@ struct netns_ipv6 { unsigned int fib6_routes_require_src; #endif struct rt6_info *ip6_prohibit_entry; diff --git a/target/linux/generic/pending-5.10/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch b/target/linux/generic/pending-5.10/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch index 0f1df84b30..ecd6e9e7a2 100644 --- a/target/linux/generic/pending-5.10/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch +++ b/target/linux/generic/pending-5.10/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch @@ -164,7 +164,7 @@ Signed-off-by: Felix Fietkau struct rtnl_link { rtnl_doit_func doit; -@@ -4682,7 +4682,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu +@@ -4684,7 +4684,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu brport_nla_put_flag(skb, flags, mask, IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) || brport_nla_put_flag(skb, flags, mask, diff --git a/target/linux/generic/pending-5.10/801-gpio-gpio-cascade-add-generic-GPIO-cascade.patch b/target/linux/generic/pending-5.10/801-gpio-gpio-cascade-add-generic-GPIO-cascade.patch index 8d3b3cf962..af44ff24ac 100644 --- a/target/linux/generic/pending-5.10/801-gpio-gpio-cascade-add-generic-GPIO-cascade.patch +++ b/target/linux/generic/pending-5.10/801-gpio-gpio-cascade-add-generic-GPIO-cascade.patch @@ -68,13 +68,11 @@ v1 -> v2: 3 files changed, 133 insertions(+) create mode 100644 drivers/gpio/gpio-cascade.c -diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig -index 37a6f77c86fe..e69457144459 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig -@@ -1694,4 +1694,19 @@ config GPIO_VIRTIO - - endmenu +@@ -1617,4 +1617,19 @@ config GPIO_MOCKUP + tools/testing/selftests/gpio/gpio-mockup.sh. Reference the usage in + it. +comment "Other GPIO expanders" + @@ -92,11 +90,9 @@ index 37a6f77c86fe..e69457144459 100644 + will be called 'gpio-cascade'. + endif -diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile -index 71ee9fc2ff83..e8945456e7ea 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile -@@ -45,6 +45,7 @@ obj-$(CONFIG_GPIO_BD9571MWV) += gpio-bd9571mwv.o +@@ -44,6 +44,7 @@ obj-$(CONFIG_GPIO_BD9571MWV) += gpio-bd obj-$(CONFIG_GPIO_BRCMSTB) += gpio-brcmstb.o obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o obj-$(CONFIG_GPIO_CADENCE) += gpio-cadence.o @@ -104,9 +100,6 @@ index 71ee9fc2ff83..e8945456e7ea 100644 obj-$(CONFIG_GPIO_CLPS711X) += gpio-clps711x.o obj-$(CONFIG_GPIO_SNPS_CREG) += gpio-creg-snps.o obj-$(CONFIG_GPIO_CRYSTAL_COVE) += gpio-crystalcove.o -diff --git a/drivers/gpio/gpio-cascade.c b/drivers/gpio/gpio-cascade.c -new file mode 100644 -index 000000000000..5cbda882d79a --- /dev/null +++ b/drivers/gpio/gpio-cascade.c @@ -0,0 +1,117 @@ @@ -227,6 +220,3 @@ index 000000000000..5cbda882d79a +MODULE_AUTHOR("Mauri Sandberg "); +MODULE_DESCRIPTION("Generic GPIO cascade"); +MODULE_LICENSE("GPL"); --- -2.25.1 - diff --git a/target/linux/generic/pending-5.10/834-ledtrig-libata.patch b/target/linux/generic/pending-5.10/834-ledtrig-libata.patch index e43a97bfe8..25cffb1444 100644 --- a/target/linux/generic/pending-5.10/834-ledtrig-libata.patch +++ b/target/linux/generic/pending-5.10/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 -@@ -4547,6 +4560,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -4548,6 +4561,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 = qc->hw_tag = tag; -@@ -5325,6 +5341,9 @@ struct ata_port *ata_port_alloc(struct a +@@ -5326,6 +5342,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; -@@ -5360,6 +5379,12 @@ static void ata_host_release(struct kref +@@ -5361,6 +5380,12 @@ static void ata_host_release(struct kref kfree(ap->pmp_link); kfree(ap->slave_link); @@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle kfree(ap); host->ports[i] = NULL; } -@@ -5766,7 +5791,23 @@ int ata_host_register(struct ata_host *h +@@ -5767,7 +5792,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; } -- cgit v1.2.3