From ddcebda08b26142d47eb3c2009d48d12781d76a3 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Tue, 13 Sep 2022 19:01:50 +0200 Subject: [PATCH] generic: 5.15: qca8k: add kernel version tag on backport patch Add kernel tag that introduced the patch on backport patch. Signed-off-by: Christian Marangi --- ...regmap-allow-to-define-reg_update_bits-for-no-bus.patch} | 0 ...et-dsa-introduce-tagger-owned-storage-for-private.patch} | 0 ...-tagging-protocols-connect-to-individual-switches.patch} | 0 ...qca8k-remove-redundant-check-in-parse_port_config.patch} | 0 ...dsa-qca8k-convert-to-GENMASK_FIELD_PREP_FIELD_GET.patch} | 0 ...-dsa-qca8k-remove-extra-mutex_init-in-qca8k_setup.patch} | 0 ...et-dsa-qca8k-move-regmap-init-in-probe-and-set-it.patch} | 0 ...-net-dsa-qca8k-initial-conversion-to-regmap-heper.patch} | 0 ...ext-net-dsa-qca8k-add-additional-MIB-counter-and-.patch} | 0 ...ext-net-dsa-qca8k-add-support-for-port-fast-aging.patch} | 0 ...et-next-net-dsa-qca8k-add-set_ageing_time-support.patch} | 0 ...et-next-net-dsa-qca8k-add-support-for-mdb_add-del.patch} | 0 ...et-next-net-dsa-qca8k-add-support-for-mirror-mode.patch} | 0 ... 763-v5.17-net-next-net-dsa-qca8k-add-LAG-support.patch} | 0 ...net-next-net-dsa-qca8k-fix-warning-in-LAG-feature.patch} | 0 ...-dsa-reorder-PHY-initialization-with-MTU-setup-in.patch} | 4 ++-- ...-dsa-merge-rtnl_lock-sections-in-dsa_slave_create.patch} | 2 +- ...xt-net-dsa-stop-updating-master-MTU-from-master.c.patch} | 0 ...-dsa-hold-rtnl_mutex-when-calling-dsa_master_-set.patch} | 0 ...-dsa-first-set-up-shared-ports-then-non-shared-po.patch} | 0 ....17-06-net-next-net-dsa-setup-master-before-ports.patch} | 0 ...-dsa-provide-switch-operations-for-tracking-the-m.patch} | 6 +++--- ...-dsa-replay-master-state-events-in-dsa_tree_-setu.patch} | 0 ...6-v5.18-03-net-dsa-tag_qca-convert-to-FIELD-macro.patch} | 0 ...-net-dsa-tag_qca-move-define-to-include-linux-dsa.patch} | 0 ...-05-net-dsa-tag_qca-enable-promisc_on_master-flag.patch} | 0 ...-dsa-tag_qca-add-define-for-handling-mgmt-Etherne.patch} | 0 ...et-dsa-tag_qca-add-define-for-handling-MIB-packet.patch} | 0 ...-dsa-tag_qca-add-support-for-handling-mgmt-and-MI.patch} | 0 ...9-net-dsa-qca8k-add-tracking-state-of-master-port.patch} | 0 ...-dsa-qca8k-add-support-for-mgmt-read-write-in-Eth.patch} | 0 ...-dsa-qca8k-add-support-for-mib-autocast-in-Ethern.patch} | 0 ...-dsa-qca8k-add-support-for-phy-read-write-with-mg.patch} | 0 ...8-13-net-dsa-qca8k-move-page-cache-to-driver-priv.patch} | 0 ...8-14-net-dsa-qca8k-cache-lo-and-hi-for-mdio-write.patch} | 0 ...-dsa-qca8k-add-support-for-larger-read-write-size.patch} | 0 ...-dsa-qca8k-introduce-qca8k_bulk_read-write-functi.patch} | 0 37 files changed, 6 insertions(+), 6 deletions(-) rename target/linux/generic/backport-5.15/{081-net-next-regmap-allow-to-define-reg_update_bits-for-no-bus.patch => 081-v5.17-regmap-allow-to-define-reg_update_bits-for-no-bus.patch} (100%) rename target/linux/generic/backport-5.15/{700-net-next-net-dsa-introduce-tagger-owned-storage-for-private.patch => 700-v5.17-net-dsa-introduce-tagger-owned-storage-for-private.patch} (100%) rename target/linux/generic/backport-5.15/{701-net-dsa-make-tagging-protocols-connect-to-individual-switches.patch => 701-v5.17-dsa-make-tagging-protocols-connect-to-individual-switches.patch} (100%) rename target/linux/generic/backport-5.15/{753-net-next-net-dsa-qca8k-remove-redundant-check-in-parse_port_config.patch => 753-v5.17-net-next-net-dsa-qca8k-remove-redundant-check-in-parse_port_config.patch} (100%) rename target/linux/generic/backport-5.15/{754-net-next-net-dsa-qca8k-convert-to-GENMASK_FIELD_PREP_FIELD_GET.patch => 754-v5.17-net-next-net-dsa-qca8k-convert-to-GENMASK_FIELD_PREP_FIELD_GET.patch} (100%) rename target/linux/generic/backport-5.15/{755-net-next-net-dsa-qca8k-remove-extra-mutex_init-in-qca8k_setup.patch => 755-v5.17-net-next-net-dsa-qca8k-remove-extra-mutex_init-in-qca8k_setup.patch} (100%) rename target/linux/generic/backport-5.15/{756-net-next-net-dsa-qca8k-move-regmap-init-in-probe-and-set-it.patch => 756-v5.17-net-next-net-dsa-qca8k-move-regmap-init-in-probe-and-set-it.patch} (100%) rename target/linux/generic/backport-5.15/{757-net-next-net-dsa-qca8k-initial-conversion-to-regmap-heper.patch => 757-v5.17-net-next-net-dsa-qca8k-initial-conversion-to-regmap-heper.patch} (100%) rename target/linux/generic/backport-5.15/{758-net-next-net-dsa-qca8k-add-additional-MIB-counter-and-.patch => 758-v5.17-net-next-net-dsa-qca8k-add-additional-MIB-counter-and-.patch} (100%) rename target/linux/generic/backport-5.15/{759-net-next-net-dsa-qca8k-add-support-for-port-fast-aging.patch => 759-v5.17-net-next-net-dsa-qca8k-add-support-for-port-fast-aging.patch} (100%) rename target/linux/generic/backport-5.15/{760-net-next-net-dsa-qca8k-add-set_ageing_time-support.patch => 760-v5.17-net-next-net-dsa-qca8k-add-set_ageing_time-support.patch} (100%) rename target/linux/generic/backport-5.15/{761-net-next-net-dsa-qca8k-add-support-for-mdb_add-del.patch => 761-v5.17-net-next-net-dsa-qca8k-add-support-for-mdb_add-del.patch} (100%) rename target/linux/generic/backport-5.15/{762-net-next-net-dsa-qca8k-add-support-for-mirror-mode.patch => 762-v5.17-net-next-net-dsa-qca8k-add-support-for-mirror-mode.patch} (100%) rename target/linux/generic/backport-5.15/{763-net-next-net-dsa-qca8k-add-LAG-support.patch => 763-v5.17-net-next-net-dsa-qca8k-add-LAG-support.patch} (100%) rename target/linux/generic/backport-5.15/{764-net-next-net-dsa-qca8k-fix-warning-in-LAG-feature.patch => 764-v5.17-net-next-net-dsa-qca8k-fix-warning-in-LAG-feature.patch} (100%) rename target/linux/generic/backport-5.15/{765-1-net-next-net-dsa-reorder-PHY-initialization-with-MTU-setup-in.patch => 765-v5.17-01-net-next-net-dsa-reorder-PHY-initialization-with-MTU-setup-in.patch} (92%) rename target/linux/generic/backport-5.15/{765-2-net-next-net-dsa-merge-rtnl_lock-sections-in-dsa_slave_create.patch => 765-v5.17-02-net-next-net-dsa-merge-rtnl_lock-sections-in-dsa_slave_create.patch} (94%) rename target/linux/generic/backport-5.15/{765-3-net-next-net-dsa-stop-updating-master-MTU-from-master.c.patch => 765-v5.17-03-net-next-net-dsa-stop-updating-master-MTU-from-master.c.patch} (100%) rename target/linux/generic/backport-5.15/{765-4-net-next-net-dsa-hold-rtnl_mutex-when-calling-dsa_master_-set.patch => 765-v5.17-04-net-next-net-dsa-hold-rtnl_mutex-when-calling-dsa_master_-set.patch} (100%) rename target/linux/generic/backport-5.15/{765-5-net-next-net-dsa-first-set-up-shared-ports-then-non-shared-po.patch => 765-v5.17-05-net-next-net-dsa-first-set-up-shared-ports-then-non-shared-po.patch} (100%) rename target/linux/generic/backport-5.15/{765-6-net-next-net-dsa-setup-master-before-ports.patch => 765-v5.17-06-net-next-net-dsa-setup-master-before-ports.patch} (100%) rename target/linux/generic/backport-5.15/{766-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch => 766-v5.18-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch} (97%) rename target/linux/generic/backport-5.15/{766-02-net-dsa-replay-master-state-events-in-dsa_tree_-setu.patch => 766-v5.18-02-net-dsa-replay-master-state-events-in-dsa_tree_-setu.patch} (100%) rename target/linux/generic/backport-5.15/{766-03-net-dsa-tag_qca-convert-to-FIELD-macro.patch => 766-v5.18-03-net-dsa-tag_qca-convert-to-FIELD-macro.patch} (100%) rename target/linux/generic/backport-5.15/{766-04-net-dsa-tag_qca-move-define-to-include-linux-dsa.patch => 766-v5.18-04-net-dsa-tag_qca-move-define-to-include-linux-dsa.patch} (100%) rename target/linux/generic/backport-5.15/{766-05-net-dsa-tag_qca-enable-promisc_on_master-flag.patch => 766-v5.18-05-net-dsa-tag_qca-enable-promisc_on_master-flag.patch} (100%) rename target/linux/generic/backport-5.15/{766-06-net-dsa-tag_qca-add-define-for-handling-mgmt-Etherne.patch => 766-v5.18-06-net-dsa-tag_qca-add-define-for-handling-mgmt-Etherne.patch} (100%) rename target/linux/generic/backport-5.15/{766-07-net-dsa-tag_qca-add-define-for-handling-MIB-packet.patch => 766-v5.18-07-net-dsa-tag_qca-add-define-for-handling-MIB-packet.patch} (100%) rename target/linux/generic/backport-5.15/{766-08-net-dsa-tag_qca-add-support-for-handling-mgmt-and-MI.patch => 766-v5.18-08-net-dsa-tag_qca-add-support-for-handling-mgmt-and-MI.patch} (100%) rename target/linux/generic/backport-5.15/{766-09-net-dsa-qca8k-add-tracking-state-of-master-port.patch => 766-v5.18-09-net-dsa-qca8k-add-tracking-state-of-master-port.patch} (100%) rename target/linux/generic/backport-5.15/{766-10-net-dsa-qca8k-add-support-for-mgmt-read-write-in-Eth.patch => 766-v5.18-10-net-dsa-qca8k-add-support-for-mgmt-read-write-in-Eth.patch} (100%) rename target/linux/generic/backport-5.15/{766-11-net-dsa-qca8k-add-support-for-mib-autocast-in-Ethern.patch => 766-v5.18-11-net-dsa-qca8k-add-support-for-mib-autocast-in-Ethern.patch} (100%) rename target/linux/generic/backport-5.15/{766-12-net-dsa-qca8k-add-support-for-phy-read-write-with-mg.patch => 766-v5.18-12-net-dsa-qca8k-add-support-for-phy-read-write-with-mg.patch} (100%) rename target/linux/generic/backport-5.15/{766-13-net-dsa-qca8k-move-page-cache-to-driver-priv.patch => 766-v5.18-13-net-dsa-qca8k-move-page-cache-to-driver-priv.patch} (100%) rename target/linux/generic/backport-5.15/{766-14-net-dsa-qca8k-cache-lo-and-hi-for-mdio-write.patch => 766-v5.18-14-net-dsa-qca8k-cache-lo-and-hi-for-mdio-write.patch} (100%) rename target/linux/generic/backport-5.15/{766-15-net-dsa-qca8k-add-support-for-larger-read-write-size.patch => 766-v5.18-15-net-dsa-qca8k-add-support-for-larger-read-write-size.patch} (100%) rename target/linux/generic/backport-5.15/{766-16-net-dsa-qca8k-introduce-qca8k_bulk_read-write-functi.patch => 766-v5.18-16-net-dsa-qca8k-introduce-qca8k_bulk_read-write-functi.patch} (100%) diff --git a/target/linux/generic/backport-5.15/081-net-next-regmap-allow-to-define-reg_update_bits-for-no-bus.patch b/target/linux/generic/backport-5.15/081-v5.17-regmap-allow-to-define-reg_update_bits-for-no-bus.patch similarity index 100% rename from target/linux/generic/backport-5.15/081-net-next-regmap-allow-to-define-reg_update_bits-for-no-bus.patch rename to target/linux/generic/backport-5.15/081-v5.17-regmap-allow-to-define-reg_update_bits-for-no-bus.patch diff --git a/target/linux/generic/backport-5.15/700-net-next-net-dsa-introduce-tagger-owned-storage-for-private.patch b/target/linux/generic/backport-5.15/700-v5.17-net-dsa-introduce-tagger-owned-storage-for-private.patch similarity index 100% rename from target/linux/generic/backport-5.15/700-net-next-net-dsa-introduce-tagger-owned-storage-for-private.patch rename to target/linux/generic/backport-5.15/700-v5.17-net-dsa-introduce-tagger-owned-storage-for-private.patch diff --git a/target/linux/generic/backport-5.15/701-net-dsa-make-tagging-protocols-connect-to-individual-switches.patch b/target/linux/generic/backport-5.15/701-v5.17-dsa-make-tagging-protocols-connect-to-individual-switches.patch similarity index 100% rename from target/linux/generic/backport-5.15/701-net-dsa-make-tagging-protocols-connect-to-individual-switches.patch rename to target/linux/generic/backport-5.15/701-v5.17-dsa-make-tagging-protocols-connect-to-individual-switches.patch diff --git a/target/linux/generic/backport-5.15/753-net-next-net-dsa-qca8k-remove-redundant-check-in-parse_port_config.patch b/target/linux/generic/backport-5.15/753-v5.17-net-next-net-dsa-qca8k-remove-redundant-check-in-parse_port_config.patch similarity index 100% rename from target/linux/generic/backport-5.15/753-net-next-net-dsa-qca8k-remove-redundant-check-in-parse_port_config.patch rename to target/linux/generic/backport-5.15/753-v5.17-net-next-net-dsa-qca8k-remove-redundant-check-in-parse_port_config.patch diff --git a/target/linux/generic/backport-5.15/754-net-next-net-dsa-qca8k-convert-to-GENMASK_FIELD_PREP_FIELD_GET.patch b/target/linux/generic/backport-5.15/754-v5.17-net-next-net-dsa-qca8k-convert-to-GENMASK_FIELD_PREP_FIELD_GET.patch similarity index 100% rename from target/linux/generic/backport-5.15/754-net-next-net-dsa-qca8k-convert-to-GENMASK_FIELD_PREP_FIELD_GET.patch rename to target/linux/generic/backport-5.15/754-v5.17-net-next-net-dsa-qca8k-convert-to-GENMASK_FIELD_PREP_FIELD_GET.patch diff --git a/target/linux/generic/backport-5.15/755-net-next-net-dsa-qca8k-remove-extra-mutex_init-in-qca8k_setup.patch b/target/linux/generic/backport-5.15/755-v5.17-net-next-net-dsa-qca8k-remove-extra-mutex_init-in-qca8k_setup.patch similarity index 100% rename from target/linux/generic/backport-5.15/755-net-next-net-dsa-qca8k-remove-extra-mutex_init-in-qca8k_setup.patch rename to target/linux/generic/backport-5.15/755-v5.17-net-next-net-dsa-qca8k-remove-extra-mutex_init-in-qca8k_setup.patch diff --git a/target/linux/generic/backport-5.15/756-net-next-net-dsa-qca8k-move-regmap-init-in-probe-and-set-it.patch b/target/linux/generic/backport-5.15/756-v5.17-net-next-net-dsa-qca8k-move-regmap-init-in-probe-and-set-it.patch similarity index 100% rename from target/linux/generic/backport-5.15/756-net-next-net-dsa-qca8k-move-regmap-init-in-probe-and-set-it.patch rename to target/linux/generic/backport-5.15/756-v5.17-net-next-net-dsa-qca8k-move-regmap-init-in-probe-and-set-it.patch diff --git a/target/linux/generic/backport-5.15/757-net-next-net-dsa-qca8k-initial-conversion-to-regmap-heper.patch b/target/linux/generic/backport-5.15/757-v5.17-net-next-net-dsa-qca8k-initial-conversion-to-regmap-heper.patch similarity index 100% rename from target/linux/generic/backport-5.15/757-net-next-net-dsa-qca8k-initial-conversion-to-regmap-heper.patch rename to target/linux/generic/backport-5.15/757-v5.17-net-next-net-dsa-qca8k-initial-conversion-to-regmap-heper.patch diff --git a/target/linux/generic/backport-5.15/758-net-next-net-dsa-qca8k-add-additional-MIB-counter-and-.patch b/target/linux/generic/backport-5.15/758-v5.17-net-next-net-dsa-qca8k-add-additional-MIB-counter-and-.patch similarity index 100% rename from target/linux/generic/backport-5.15/758-net-next-net-dsa-qca8k-add-additional-MIB-counter-and-.patch rename to target/linux/generic/backport-5.15/758-v5.17-net-next-net-dsa-qca8k-add-additional-MIB-counter-and-.patch diff --git a/target/linux/generic/backport-5.15/759-net-next-net-dsa-qca8k-add-support-for-port-fast-aging.patch b/target/linux/generic/backport-5.15/759-v5.17-net-next-net-dsa-qca8k-add-support-for-port-fast-aging.patch similarity index 100% rename from target/linux/generic/backport-5.15/759-net-next-net-dsa-qca8k-add-support-for-port-fast-aging.patch rename to target/linux/generic/backport-5.15/759-v5.17-net-next-net-dsa-qca8k-add-support-for-port-fast-aging.patch diff --git a/target/linux/generic/backport-5.15/760-net-next-net-dsa-qca8k-add-set_ageing_time-support.patch b/target/linux/generic/backport-5.15/760-v5.17-net-next-net-dsa-qca8k-add-set_ageing_time-support.patch similarity index 100% rename from target/linux/generic/backport-5.15/760-net-next-net-dsa-qca8k-add-set_ageing_time-support.patch rename to target/linux/generic/backport-5.15/760-v5.17-net-next-net-dsa-qca8k-add-set_ageing_time-support.patch diff --git a/target/linux/generic/backport-5.15/761-net-next-net-dsa-qca8k-add-support-for-mdb_add-del.patch b/target/linux/generic/backport-5.15/761-v5.17-net-next-net-dsa-qca8k-add-support-for-mdb_add-del.patch similarity index 100% rename from target/linux/generic/backport-5.15/761-net-next-net-dsa-qca8k-add-support-for-mdb_add-del.patch rename to target/linux/generic/backport-5.15/761-v5.17-net-next-net-dsa-qca8k-add-support-for-mdb_add-del.patch diff --git a/target/linux/generic/backport-5.15/762-net-next-net-dsa-qca8k-add-support-for-mirror-mode.patch b/target/linux/generic/backport-5.15/762-v5.17-net-next-net-dsa-qca8k-add-support-for-mirror-mode.patch similarity index 100% rename from target/linux/generic/backport-5.15/762-net-next-net-dsa-qca8k-add-support-for-mirror-mode.patch rename to target/linux/generic/backport-5.15/762-v5.17-net-next-net-dsa-qca8k-add-support-for-mirror-mode.patch diff --git a/target/linux/generic/backport-5.15/763-net-next-net-dsa-qca8k-add-LAG-support.patch b/target/linux/generic/backport-5.15/763-v5.17-net-next-net-dsa-qca8k-add-LAG-support.patch similarity index 100% rename from target/linux/generic/backport-5.15/763-net-next-net-dsa-qca8k-add-LAG-support.patch rename to target/linux/generic/backport-5.15/763-v5.17-net-next-net-dsa-qca8k-add-LAG-support.patch diff --git a/target/linux/generic/backport-5.15/764-net-next-net-dsa-qca8k-fix-warning-in-LAG-feature.patch b/target/linux/generic/backport-5.15/764-v5.17-net-next-net-dsa-qca8k-fix-warning-in-LAG-feature.patch similarity index 100% rename from target/linux/generic/backport-5.15/764-net-next-net-dsa-qca8k-fix-warning-in-LAG-feature.patch rename to target/linux/generic/backport-5.15/764-v5.17-net-next-net-dsa-qca8k-fix-warning-in-LAG-feature.patch diff --git a/target/linux/generic/backport-5.15/765-1-net-next-net-dsa-reorder-PHY-initialization-with-MTU-setup-in.patch b/target/linux/generic/backport-5.15/765-v5.17-01-net-next-net-dsa-reorder-PHY-initialization-with-MTU-setup-in.patch similarity index 92% rename from target/linux/generic/backport-5.15/765-1-net-next-net-dsa-reorder-PHY-initialization-with-MTU-setup-in.patch rename to target/linux/generic/backport-5.15/765-v5.17-01-net-next-net-dsa-reorder-PHY-initialization-with-MTU-setup-in.patch index 77cf63b809b..1786bf03452 100644 --- a/target/linux/generic/backport-5.15/765-1-net-next-net-dsa-reorder-PHY-initialization-with-MTU-setup-in.patch +++ b/target/linux/generic/backport-5.15/765-v5.17-01-net-next-net-dsa-reorder-PHY-initialization-with-MTU-setup-in.patch @@ -22,7 +22,7 @@ Signed-off-by: David S. Miller --- a/net/dsa/slave.c +++ b/net/dsa/slave.c -@@ -1977,13 +1977,6 @@ int dsa_slave_create(struct dsa_port *po +@@ -1986,13 +1986,6 @@ int dsa_slave_create(struct dsa_port *po port->slave = slave_dev; dsa_slave_setup_tagger(slave_dev); @@ -36,7 +36,7 @@ Signed-off-by: David S. Miller netif_carrier_off(slave_dev); ret = dsa_slave_phy_setup(slave_dev); -@@ -1995,6 +1988,13 @@ int dsa_slave_create(struct dsa_port *po +@@ -2004,6 +1997,13 @@ int dsa_slave_create(struct dsa_port *po } rtnl_lock(); diff --git a/target/linux/generic/backport-5.15/765-2-net-next-net-dsa-merge-rtnl_lock-sections-in-dsa_slave_create.patch b/target/linux/generic/backport-5.15/765-v5.17-02-net-next-net-dsa-merge-rtnl_lock-sections-in-dsa_slave_create.patch similarity index 94% rename from target/linux/generic/backport-5.15/765-2-net-next-net-dsa-merge-rtnl_lock-sections-in-dsa_slave_create.patch rename to target/linux/generic/backport-5.15/765-v5.17-02-net-next-net-dsa-merge-rtnl_lock-sections-in-dsa_slave_create.patch index 50aa5d8f0dd..c2493a08fd9 100644 --- a/target/linux/generic/backport-5.15/765-2-net-next-net-dsa-merge-rtnl_lock-sections-in-dsa_slave_create.patch +++ b/target/linux/generic/backport-5.15/765-v5.17-02-net-next-net-dsa-merge-rtnl_lock-sections-in-dsa_slave_create.patch @@ -16,7 +16,7 @@ Signed-off-by: David S. Miller --- a/net/dsa/slave.c +++ b/net/dsa/slave.c -@@ -1988,14 +1988,12 @@ int dsa_slave_create(struct dsa_port *po +@@ -1997,14 +1997,12 @@ int dsa_slave_create(struct dsa_port *po } rtnl_lock(); diff --git a/target/linux/generic/backport-5.15/765-3-net-next-net-dsa-stop-updating-master-MTU-from-master.c.patch b/target/linux/generic/backport-5.15/765-v5.17-03-net-next-net-dsa-stop-updating-master-MTU-from-master.c.patch similarity index 100% rename from target/linux/generic/backport-5.15/765-3-net-next-net-dsa-stop-updating-master-MTU-from-master.c.patch rename to target/linux/generic/backport-5.15/765-v5.17-03-net-next-net-dsa-stop-updating-master-MTU-from-master.c.patch diff --git a/target/linux/generic/backport-5.15/765-4-net-next-net-dsa-hold-rtnl_mutex-when-calling-dsa_master_-set.patch b/target/linux/generic/backport-5.15/765-v5.17-04-net-next-net-dsa-hold-rtnl_mutex-when-calling-dsa_master_-set.patch similarity index 100% rename from target/linux/generic/backport-5.15/765-4-net-next-net-dsa-hold-rtnl_mutex-when-calling-dsa_master_-set.patch rename to target/linux/generic/backport-5.15/765-v5.17-04-net-next-net-dsa-hold-rtnl_mutex-when-calling-dsa_master_-set.patch diff --git a/target/linux/generic/backport-5.15/765-5-net-next-net-dsa-first-set-up-shared-ports-then-non-shared-po.patch b/target/linux/generic/backport-5.15/765-v5.17-05-net-next-net-dsa-first-set-up-shared-ports-then-non-shared-po.patch similarity index 100% rename from target/linux/generic/backport-5.15/765-5-net-next-net-dsa-first-set-up-shared-ports-then-non-shared-po.patch rename to target/linux/generic/backport-5.15/765-v5.17-05-net-next-net-dsa-first-set-up-shared-ports-then-non-shared-po.patch diff --git a/target/linux/generic/backport-5.15/765-6-net-next-net-dsa-setup-master-before-ports.patch b/target/linux/generic/backport-5.15/765-v5.17-06-net-next-net-dsa-setup-master-before-ports.patch similarity index 100% rename from target/linux/generic/backport-5.15/765-6-net-next-net-dsa-setup-master-before-ports.patch rename to target/linux/generic/backport-5.15/765-v5.17-06-net-next-net-dsa-setup-master-before-ports.patch diff --git a/target/linux/generic/backport-5.15/766-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch b/target/linux/generic/backport-5.15/766-v5.18-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch similarity index 97% rename from target/linux/generic/backport-5.15/766-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch rename to target/linux/generic/backport-5.15/766-v5.18-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch index 7c6a3a3f8d7..d73b7455866 100644 --- a/target/linux/generic/backport-5.15/766-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch +++ b/target/linux/generic/backport-5.15/766-v5.18-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch @@ -68,7 +68,7 @@ Signed-off-by: David S. Miller static inline bool dsa_is_unused_port(struct dsa_switch *ds, int p) { return dsa_to_port(ds, p)->type == DSA_PORT_TYPE_UNUSED; -@@ -949,6 +959,13 @@ struct dsa_switch_ops { +@@ -916,6 +926,13 @@ struct dsa_switch_ops { int (*tag_8021q_vlan_add)(struct dsa_switch *ds, int port, u16 vid, u16 flags); int (*tag_8021q_vlan_del)(struct dsa_switch *ds, int port, u16 vid); @@ -175,7 +175,7 @@ Signed-off-by: David S. Miller --- a/net/dsa/slave.c +++ b/net/dsa/slave.c -@@ -2311,6 +2311,36 @@ static int dsa_slave_netdevice_event(str +@@ -2320,6 +2320,36 @@ static int dsa_slave_netdevice_event(str err = dsa_port_lag_change(dp, info->lower_state_info); return notifier_from_errno(err); } @@ -212,7 +212,7 @@ Signed-off-by: David S. Miller case NETDEV_GOING_DOWN: { struct dsa_port *dp, *cpu_dp; struct dsa_switch_tree *dst; -@@ -2322,6 +2352,8 @@ static int dsa_slave_netdevice_event(str +@@ -2331,6 +2361,8 @@ static int dsa_slave_netdevice_event(str cpu_dp = dev->dsa_ptr; dst = cpu_dp->ds->dst; diff --git a/target/linux/generic/backport-5.15/766-02-net-dsa-replay-master-state-events-in-dsa_tree_-setu.patch b/target/linux/generic/backport-5.15/766-v5.18-02-net-dsa-replay-master-state-events-in-dsa_tree_-setu.patch similarity index 100% rename from target/linux/generic/backport-5.15/766-02-net-dsa-replay-master-state-events-in-dsa_tree_-setu.patch rename to target/linux/generic/backport-5.15/766-v5.18-02-net-dsa-replay-master-state-events-in-dsa_tree_-setu.patch diff --git a/target/linux/generic/backport-5.15/766-03-net-dsa-tag_qca-convert-to-FIELD-macro.patch b/target/linux/generic/backport-5.15/766-v5.18-03-net-dsa-tag_qca-convert-to-FIELD-macro.patch similarity index 100% rename from target/linux/generic/backport-5.15/766-03-net-dsa-tag_qca-convert-to-FIELD-macro.patch rename to target/linux/generic/backport-5.15/766-v5.18-03-net-dsa-tag_qca-convert-to-FIELD-macro.patch diff --git a/target/linux/generic/backport-5.15/766-04-net-dsa-tag_qca-move-define-to-include-linux-dsa.patch b/target/linux/generic/backport-5.15/766-v5.18-04-net-dsa-tag_qca-move-define-to-include-linux-dsa.patch similarity index 100% rename from target/linux/generic/backport-5.15/766-04-net-dsa-tag_qca-move-define-to-include-linux-dsa.patch rename to target/linux/generic/backport-5.15/766-v5.18-04-net-dsa-tag_qca-move-define-to-include-linux-dsa.patch diff --git a/target/linux/generic/backport-5.15/766-05-net-dsa-tag_qca-enable-promisc_on_master-flag.patch b/target/linux/generic/backport-5.15/766-v5.18-05-net-dsa-tag_qca-enable-promisc_on_master-flag.patch similarity index 100% rename from target/linux/generic/backport-5.15/766-05-net-dsa-tag_qca-enable-promisc_on_master-flag.patch rename to target/linux/generic/backport-5.15/766-v5.18-05-net-dsa-tag_qca-enable-promisc_on_master-flag.patch diff --git a/target/linux/generic/backport-5.15/766-06-net-dsa-tag_qca-add-define-for-handling-mgmt-Etherne.patch b/target/linux/generic/backport-5.15/766-v5.18-06-net-dsa-tag_qca-add-define-for-handling-mgmt-Etherne.patch similarity index 100% rename from target/linux/generic/backport-5.15/766-06-net-dsa-tag_qca-add-define-for-handling-mgmt-Etherne.patch rename to target/linux/generic/backport-5.15/766-v5.18-06-net-dsa-tag_qca-add-define-for-handling-mgmt-Etherne.patch diff --git a/target/linux/generic/backport-5.15/766-07-net-dsa-tag_qca-add-define-for-handling-MIB-packet.patch b/target/linux/generic/backport-5.15/766-v5.18-07-net-dsa-tag_qca-add-define-for-handling-MIB-packet.patch similarity index 100% rename from target/linux/generic/backport-5.15/766-07-net-dsa-tag_qca-add-define-for-handling-MIB-packet.patch rename to target/linux/generic/backport-5.15/766-v5.18-07-net-dsa-tag_qca-add-define-for-handling-MIB-packet.patch diff --git a/target/linux/generic/backport-5.15/766-08-net-dsa-tag_qca-add-support-for-handling-mgmt-and-MI.patch b/target/linux/generic/backport-5.15/766-v5.18-08-net-dsa-tag_qca-add-support-for-handling-mgmt-and-MI.patch similarity index 100% rename from target/linux/generic/backport-5.15/766-08-net-dsa-tag_qca-add-support-for-handling-mgmt-and-MI.patch rename to target/linux/generic/backport-5.15/766-v5.18-08-net-dsa-tag_qca-add-support-for-handling-mgmt-and-MI.patch diff --git a/target/linux/generic/backport-5.15/766-09-net-dsa-qca8k-add-tracking-state-of-master-port.patch b/target/linux/generic/backport-5.15/766-v5.18-09-net-dsa-qca8k-add-tracking-state-of-master-port.patch similarity index 100% rename from target/linux/generic/backport-5.15/766-09-net-dsa-qca8k-add-tracking-state-of-master-port.patch rename to target/linux/generic/backport-5.15/766-v5.18-09-net-dsa-qca8k-add-tracking-state-of-master-port.patch diff --git a/target/linux/generic/backport-5.15/766-10-net-dsa-qca8k-add-support-for-mgmt-read-write-in-Eth.patch b/target/linux/generic/backport-5.15/766-v5.18-10-net-dsa-qca8k-add-support-for-mgmt-read-write-in-Eth.patch similarity index 100% rename from target/linux/generic/backport-5.15/766-10-net-dsa-qca8k-add-support-for-mgmt-read-write-in-Eth.patch rename to target/linux/generic/backport-5.15/766-v5.18-10-net-dsa-qca8k-add-support-for-mgmt-read-write-in-Eth.patch diff --git a/target/linux/generic/backport-5.15/766-11-net-dsa-qca8k-add-support-for-mib-autocast-in-Ethern.patch b/target/linux/generic/backport-5.15/766-v5.18-11-net-dsa-qca8k-add-support-for-mib-autocast-in-Ethern.patch similarity index 100% rename from target/linux/generic/backport-5.15/766-11-net-dsa-qca8k-add-support-for-mib-autocast-in-Ethern.patch rename to target/linux/generic/backport-5.15/766-v5.18-11-net-dsa-qca8k-add-support-for-mib-autocast-in-Ethern.patch diff --git a/target/linux/generic/backport-5.15/766-12-net-dsa-qca8k-add-support-for-phy-read-write-with-mg.patch b/target/linux/generic/backport-5.15/766-v5.18-12-net-dsa-qca8k-add-support-for-phy-read-write-with-mg.patch similarity index 100% rename from target/linux/generic/backport-5.15/766-12-net-dsa-qca8k-add-support-for-phy-read-write-with-mg.patch rename to target/linux/generic/backport-5.15/766-v5.18-12-net-dsa-qca8k-add-support-for-phy-read-write-with-mg.patch diff --git a/target/linux/generic/backport-5.15/766-13-net-dsa-qca8k-move-page-cache-to-driver-priv.patch b/target/linux/generic/backport-5.15/766-v5.18-13-net-dsa-qca8k-move-page-cache-to-driver-priv.patch similarity index 100% rename from target/linux/generic/backport-5.15/766-13-net-dsa-qca8k-move-page-cache-to-driver-priv.patch rename to target/linux/generic/backport-5.15/766-v5.18-13-net-dsa-qca8k-move-page-cache-to-driver-priv.patch diff --git a/target/linux/generic/backport-5.15/766-14-net-dsa-qca8k-cache-lo-and-hi-for-mdio-write.patch b/target/linux/generic/backport-5.15/766-v5.18-14-net-dsa-qca8k-cache-lo-and-hi-for-mdio-write.patch similarity index 100% rename from target/linux/generic/backport-5.15/766-14-net-dsa-qca8k-cache-lo-and-hi-for-mdio-write.patch rename to target/linux/generic/backport-5.15/766-v5.18-14-net-dsa-qca8k-cache-lo-and-hi-for-mdio-write.patch diff --git a/target/linux/generic/backport-5.15/766-15-net-dsa-qca8k-add-support-for-larger-read-write-size.patch b/target/linux/generic/backport-5.15/766-v5.18-15-net-dsa-qca8k-add-support-for-larger-read-write-size.patch similarity index 100% rename from target/linux/generic/backport-5.15/766-15-net-dsa-qca8k-add-support-for-larger-read-write-size.patch rename to target/linux/generic/backport-5.15/766-v5.18-15-net-dsa-qca8k-add-support-for-larger-read-write-size.patch diff --git a/target/linux/generic/backport-5.15/766-16-net-dsa-qca8k-introduce-qca8k_bulk_read-write-functi.patch b/target/linux/generic/backport-5.15/766-v5.18-16-net-dsa-qca8k-introduce-qca8k_bulk_read-write-functi.patch similarity index 100% rename from target/linux/generic/backport-5.15/766-16-net-dsa-qca8k-introduce-qca8k_bulk_read-write-functi.patch rename to target/linux/generic/backport-5.15/766-v5.18-16-net-dsa-qca8k-introduce-qca8k_bulk_read-write-functi.patch -- 2.30.2