From e4af991220638d4bb32e4668435d140afe232b25 Mon Sep 17 00:00:00 2001 From: John Audia Date: Tue, 12 Jul 2022 11:52:59 -0400 Subject: kernel: bump 5.15 to 5.15.54 All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia --- ...66-10-net-dsa-qca8k-add-support-for-mgmt-read-write-in-Eth.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/generic/backport-5.15/766-10-net-dsa-qca8k-add-support-for-mgmt-read-write-in-Eth.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-10-net-dsa-qca8k-add-support-for-mgmt-read-write-in-Eth.patch index 43656ad79d..07c5ba4621 100644 --- 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-10-net-dsa-qca8k-add-support-for-mgmt-read-write-in-Eth.patch @@ -276,7 +276,7 @@ Signed-off-by: David S. Miller qca8k_split_addr(reg, &r1, &r2, &page); mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED); -@@ -2393,7 +2591,30 @@ qca8k_master_change(struct dsa_switch *d +@@ -2412,7 +2610,30 @@ qca8k_master_change(struct dsa_switch *d if (dp->index != 0) return; @@ -307,7 +307,7 @@ Signed-off-by: David S. Miller } static const struct dsa_switch_ops qca8k_switch_ops = { -@@ -2432,6 +2653,7 @@ static const struct dsa_switch_ops qca8k +@@ -2451,6 +2672,7 @@ static const struct dsa_switch_ops qca8k .port_lag_join = qca8k_port_lag_join, .port_lag_leave = qca8k_port_lag_leave, .master_state_change = qca8k_master_change, @@ -315,7 +315,7 @@ Signed-off-by: David S. Miller }; static int qca8k_read_switch_id(struct qca8k_priv *priv) -@@ -2511,6 +2733,9 @@ qca8k_sw_probe(struct mdio_device *mdiod +@@ -2530,6 +2752,9 @@ qca8k_sw_probe(struct mdio_device *mdiod if (!priv->ds) return -ENOMEM; -- cgit v1.2.3