kernel: bump 6.1 to 6.1.36

All patches automatically rebased.

Acknowledgment to @john-tho for the changes to fs.mk to accommodate new paths
introduced in https://github.com/gregkh/linux/commit/29429a1f5871dbe54ee0da81bb12db8567f15379

Build system: x86_64
Build-tested: bcm2711/RPi4B
Run-tested: bcm2711/RPi4B

Signed-off-by: John Audia <[email protected]>

include/kernel-6.1

@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .35
-LINUX_KERNEL_HASH-6.1.35 = be368143bc5d0dc73dd3e8c6191630c1620520379baf6f47c16116b2c0bc26ac
+LINUX_VERSION-6.1 = .36
+LINUX_KERNEL_HASH-6.1.36 = d8ca0e300f30b9ff70c6e1497c638a1dac1407f45d3655e9c62c6e45a08afe6b

package/kernel/linux/modules/fs.mk

@@ -87,10 +87,14 @@ define KernelPackage/fs-smbfs-common
   SUBMENU:=$(FS_MENU)
   TITLE:=SMBFS common dependencies support
   HIDDEN:=1
-  KCONFIG:=CONFIG_SMBFS_COMMON
+  KCONFIG:=\
+	[email protected] \
+	[email protected]
   FILES:= \
-	$(LINUX_DIR)/fs/smbfs_common/cifs_arc4.ko \
-	$(LINUX_DIR)/fs/smbfs_common/cifs_md4.ko
+	$(LINUX_DIR)/fs/smbfs_common/[email protected] \
+	$(LINUX_DIR)/fs/smbfs_common/[email protected] \
+	$(LINUX_DIR)/fs/smb/common/[email protected] \
+	$(LINUX_DIR)/fs/smb/common/[email protected]
 endef
 
 define KernelPackage/fs-smbfs-common/description
@@ -108,7 +112,8 @@ define KernelPackage/fs-cifs
 	CONFIG_CIFS_DFS_UPCALL=n \
 	CONFIG_CIFS_UPCALL=n
   FILES:= \
-	$(LINUX_DIR)/fs/cifs/cifs.ko
+	$(LINUX_DIR)/fs/cifs/[email protected] \
+	$(LINUX_DIR)/fs/smb/client/[email protected]
   AUTOLOAD:=$(call AutoLoad,30,cifs)
   $(call AddDepends/nls)
   DEPENDS+= \
@@ -373,7 +378,9 @@ define KernelPackage/fs-ksmbd
 	CONFIG_SMB_SERVER_SMBDIRECT=n \
 	CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=n \
 	CONFIG_SMB_SERVER_KERBEROS5=n
-  FILES:=$(LINUX_DIR)/fs/ksmbd/ksmbd.ko
+  FILES:= \
+	 $(LINUX_DIR)/fs/ksmbd/[email protected] \
+	 $(LINUX_DIR)/fs/smb/server/[email protected]
   AUTOLOAD:=$(call AutoLoad,41,ksmbd)
 endef
 

target/linux/bcm27xx/patches-6.1/950-0084-cgroup-Disable-cgroup-memory-by-default.patch

@@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <[email protected]>
 
 --- a/kernel/cgroup/cgroup.c
 +++ b/kernel/cgroup/cgroup.c
-@@ -6046,6 +6046,9 @@ int __init cgroup_init_early(void)
+@@ -6060,6 +6060,9 @@ int __init cgroup_init_early(void)
  	return 0;
  }
  
@@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  /**
   * cgroup_init - cgroup initialization
   *
-@@ -6079,6 +6082,12 @@ int __init cgroup_init(void)
+@@ -6093,6 +6096,12 @@ int __init cgroup_init(void)
  
  	cgroup_unlock();
  
@@ -40,7 +40,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  	for_each_subsys(ss, ssid) {
  		if (ss->early_init) {
  			struct cgroup_subsys_state *css =
-@@ -6716,6 +6725,10 @@ static int __init cgroup_disable(char *s
+@@ -6730,6 +6739,10 @@ static int __init cgroup_disable(char *s
  			    strcmp(token, ss->legacy_name))
  				continue;
  
@@ -51,7 +51,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  			static_branch_disable(cgroup_subsys_enabled_key[i]);
  			pr_info("Disabling %s control group subsystem\n",
  				ss->name);
-@@ -6734,6 +6747,31 @@ static int __init cgroup_disable(char *s
+@@ -6748,6 +6761,31 @@ static int __init cgroup_disable(char *s
  }
  __setup("cgroup_disable=", cgroup_disable);
  

target/linux/bcm27xx/patches-6.1/950-0239-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch

@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  /* Device and char device-related information */
  static DEFINE_IDA(gpio_ida);
  static dev_t gpio_devt;
-@@ -2414,8 +2416,8 @@ int gpiod_direction_output(struct gpio_d
+@@ -2423,8 +2425,8 @@ int gpiod_direction_output(struct gpio_d
  		value = !!value;
  
  	/* GPIOs used for enabled IRQs shall not be set as output */
@@ -37,7 +37,7 @@ Signed-off-by: Phil Elwell <[email protected]>
  		gpiod_err(desc,
  			  "%s: tried to set a GPIO tied to an IRQ as output\n",
  			  __func__);
-@@ -3293,8 +3295,8 @@ int gpiochip_lock_as_irq(struct gpio_chi
+@@ -3302,8 +3304,8 @@ int gpiochip_lock_as_irq(struct gpio_chi
  	}
  
  	/* To be valid for IRQ the line needs to be input or open drain */

target/linux/generic/backport-6.1/788-v6.3-net-dsa-mt7530-use-external-PCS-driver.patch

@@ -81,7 +81,7 @@ Tested-by: Frank Wunderlich <[email protected]>
  #include <linux/phylink.h>
  #include <linux/regmap.h>
  #include <linux/regulator/consumer.h>
-@@ -2597,128 +2598,11 @@ static int mt7531_rgmii_setup(struct mt7
+@@ -2611,128 +2612,11 @@ static int mt7531_rgmii_setup(struct mt7
  	return 0;
  }
  
@@ -210,7 +210,7 @@ Tested-by: Frank Wunderlich <[email protected]>
  static int
  mt7531_mac_config(struct dsa_switch *ds, int port, unsigned int mode,
  		  phy_interface_t interface)
-@@ -2741,11 +2625,11 @@ mt7531_mac_config(struct dsa_switch *ds,
+@@ -2755,11 +2639,11 @@ mt7531_mac_config(struct dsa_switch *ds,
  		phydev = dp->slave->phydev;
  		return mt7531_rgmii_setup(priv, port, interface, phydev);
  	case PHY_INTERFACE_MODE_SGMII:
@@ -224,7 +224,7 @@ Tested-by: Frank Wunderlich <[email protected]>
  	default:
  		return -EINVAL;
  	}
-@@ -2770,11 +2654,11 @@ mt753x_phylink_mac_select_pcs(struct dsa
+@@ -2784,11 +2668,11 @@ mt753x_phylink_mac_select_pcs(struct dsa
  
  	switch (interface) {
  	case PHY_INTERFACE_MODE_TRGMII:
@@ -238,7 +238,7 @@ Tested-by: Frank Wunderlich <[email protected]>
  	default:
  		return NULL;
  	}
-@@ -3015,86 +2899,6 @@ static void mt7530_pcs_get_state(struct
+@@ -3029,86 +2913,6 @@ static void mt7530_pcs_get_state(struct
  		state->pause |= MLO_PAUSE_TX;
  }
  
@@ -325,7 +325,7 @@ Tested-by: Frank Wunderlich <[email protected]>
  static int mt753x_pcs_config(struct phylink_pcs *pcs, unsigned int mode,
  			     phy_interface_t interface,
  			     const unsigned long *advertising,
-@@ -3114,18 +2918,57 @@ static const struct phylink_pcs_ops mt75
+@@ -3128,18 +2932,57 @@ static const struct phylink_pcs_ops mt75
  	.pcs_an_restart = mt7530_pcs_an_restart,
  };
  
@@ -389,7 +389,7 @@ Tested-by: Frank Wunderlich <[email protected]>
  	int i, ret;
  
  	/* Initialise the PCS devices */
-@@ -3133,8 +2976,6 @@ mt753x_setup(struct dsa_switch *ds)
+@@ -3147,8 +2990,6 @@ mt753x_setup(struct dsa_switch *ds)
  		priv->pcs[i].pcs.ops = priv->info->pcs_ops;
  		priv->pcs[i].priv = priv;
  		priv->pcs[i].port = i;
@@ -398,7 +398,7 @@ Tested-by: Frank Wunderlich <[email protected]>
  	}
  
  	ret = priv->info->sw_setup(ds);
-@@ -3149,6 +2990,16 @@ mt753x_setup(struct dsa_switch *ds)
+@@ -3163,6 +3004,16 @@ mt753x_setup(struct dsa_switch *ds)
  	if (ret && priv->irq)
  		mt7530_free_irq_common(priv);
  
@@ -415,7 +415,7 @@ Tested-by: Frank Wunderlich <[email protected]>
  	return ret;
  }
  
-@@ -3240,7 +3091,7 @@ static const struct mt753x_info mt753x_t
+@@ -3254,7 +3105,7 @@ static const struct mt753x_info mt753x_t
  	},
  	[ID_MT7531] = {
  		.id = ID_MT7531,
@@ -424,7 +424,7 @@ Tested-by: Frank Wunderlich <[email protected]>
  		.sw_setup = mt7531_setup,
  		.phy_read = mt7531_ind_phy_read,
  		.phy_write = mt7531_ind_phy_write,
-@@ -3348,7 +3199,7 @@ static void
+@@ -3362,7 +3213,7 @@ static void
  mt7530_remove(struct mdio_device *mdiodev)
  {
  	struct mt7530_priv *priv = dev_get_drvdata(&mdiodev->dev);
@@ -433,7 +433,7 @@ Tested-by: Frank Wunderlich <[email protected]>
  
  	if (!priv)
  		return;
-@@ -3367,6 +3218,10 @@ mt7530_remove(struct mdio_device *mdiode
+@@ -3381,6 +3232,10 @@ mt7530_remove(struct mdio_device *mdiode
  		mt7530_free_irq(priv);
  
  	dsa_unregister_switch(priv->ds);
@@ -446,7 +446,7 @@ Tested-by: Frank Wunderlich <[email protected]>
  
 --- a/drivers/net/dsa/mt7530.h
 +++ b/drivers/net/dsa/mt7530.h
-@@ -364,47 +364,8 @@ enum mt7530_vlan_port_acc_frm {
+@@ -369,47 +369,8 @@ enum mt7530_vlan_port_acc_frm {
  					 CCR_TX_OCT_CNT_BAD)
  
  /* MT7531 SGMII register group */
@@ -496,7 +496,7 @@ Tested-by: Frank Wunderlich <[email protected]>
  
  /* Register for system reset */
  #define MT7530_SYS_CTRL			0x7000
-@@ -703,13 +664,13 @@ struct mt7530_fdb {
+@@ -708,13 +669,13 @@ struct mt7530_fdb {
   * @pm:		The matrix used to show all connections with the port.
   * @pvid:	The VLAN specified is to be considered a PVID at ingress.  Any
   *		untagged frames will be assigned to the related VLAN.

target/linux/generic/backport-6.1/790-v6.4-0002-net-dsa-mt7530-refactor-SGMII-PCS-creation.patch

@@ -18,7 +18,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -2950,26 +2950,56 @@ static const struct regmap_bus mt7531_re
+@@ -2964,26 +2964,56 @@ static const struct regmap_bus mt7531_re
  	.reg_update_bits = mt7530_regmap_update_bits,
  };
  
@@ -88,7 +88,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	int i, ret;
  
  	/* Initialise the PCS devices */
-@@ -2991,15 +3021,11 @@ mt753x_setup(struct dsa_switch *ds)
+@@ -3005,15 +3035,11 @@ mt753x_setup(struct dsa_switch *ds)
  	if (ret && priv->irq)
  		mt7530_free_irq_common(priv);
  

target/linux/generic/backport-6.1/790-v6.4-0003-net-dsa-mt7530-use-unlocked-regmap-accessors.patch

@@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -2923,7 +2923,7 @@ static int mt7530_regmap_read(void *cont
+@@ -2937,7 +2937,7 @@ static int mt7530_regmap_read(void *cont
  {
  	struct mt7530_priv *priv = context;
  
@@ -28,7 +28,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	return 0;
  };
  
-@@ -2931,23 +2931,25 @@ static int mt7530_regmap_write(void *con
+@@ -2945,23 +2945,25 @@ static int mt7530_regmap_write(void *con
  {
  	struct mt7530_priv *priv = context;
  
@@ -62,7 +62,7 @@ Signed-off-by: David S. Miller <[email protected]>
  };
  
  static int
-@@ -2973,6 +2975,9 @@ mt7531_create_sgmii(struct mt7530_priv *
+@@ -2987,6 +2989,9 @@ mt7531_create_sgmii(struct mt7530_priv *
  		mt7531_pcs_config[i]->reg_stride = 4;
  		mt7531_pcs_config[i]->reg_base = MT7531_SGMII_REG_BASE(5 + i);
  		mt7531_pcs_config[i]->max_register = 0x17c;

target/linux/generic/backport-6.1/790-v6.4-0004-net-dsa-mt7530-use-regmap-to-access-switch-register-.patch

@@ -133,7 +133,7 @@ Signed-off-by: David S. Miller <[email protected]>
  }
  
  static void
-@@ -2919,22 +2940,6 @@ static const struct phylink_pcs_ops mt75
+@@ -2933,22 +2954,6 @@ static const struct phylink_pcs_ops mt75
  	.pcs_an_restart = mt7530_pcs_an_restart,
  };
  
@@ -156,7 +156,7 @@ Signed-off-by: David S. Miller <[email protected]>
  static void
  mt7530_mdio_regmap_lock(void *mdio_lock)
  {
-@@ -2947,7 +2952,7 @@ mt7530_mdio_regmap_unlock(void *mdio_loc
+@@ -2961,7 +2966,7 @@ mt7530_mdio_regmap_unlock(void *mdio_loc
  	mutex_unlock(mdio_lock);
  }
  
@@ -165,7 +165,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	.reg_write = mt7530_regmap_write,
  	.reg_read = mt7530_regmap_read,
  };
-@@ -2980,7 +2985,7 @@ mt7531_create_sgmii(struct mt7530_priv *
+@@ -2994,7 +2999,7 @@ mt7531_create_sgmii(struct mt7530_priv *
  		mt7531_pcs_config[i]->lock_arg = &priv->bus->mdio_lock;
  
  		regmap = devm_regmap_init(priv->dev,
@@ -174,7 +174,7 @@ Signed-off-by: David S. Miller <[email protected]>
  					  mt7531_pcs_config[i]);
  		if (IS_ERR(regmap)) {
  			ret = PTR_ERR(regmap);
-@@ -3145,6 +3150,7 @@ MODULE_DEVICE_TABLE(of, mt7530_of_match)
+@@ -3159,6 +3164,7 @@ MODULE_DEVICE_TABLE(of, mt7530_of_match)
  static int
  mt7530_probe(struct mdio_device *mdiodev)
  {
@@ -182,7 +182,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	struct mt7530_priv *priv;
  	struct device_node *dn;
  
-@@ -3224,6 +3230,21 @@ mt7530_probe(struct mdio_device *mdiodev
+@@ -3238,6 +3244,21 @@ mt7530_probe(struct mdio_device *mdiodev
  	mutex_init(&priv->reg_mutex);
  	dev_set_drvdata(&mdiodev->dev, priv);
  
@@ -206,7 +206,7 @@ Signed-off-by: David S. Miller <[email protected]>
  
 --- a/drivers/net/dsa/mt7530.h
 +++ b/drivers/net/dsa/mt7530.h
-@@ -747,6 +747,7 @@ struct mt753x_info {
+@@ -752,6 +752,7 @@ struct mt753x_info {
   * @dev:		The device pointer
   * @ds:			The pointer to the dsa core structure
   * @bus:		The bus used for the device and built-in PHY
@@ -214,7 +214,7 @@ Signed-off-by: David S. Miller <[email protected]>
   * @rstc:		The pointer to reset control used by MCM
   * @core_pwr:		The power supplied into the core
   * @io_pwr:		The power supplied into the I/O
-@@ -767,6 +768,7 @@ struct mt7530_priv {
+@@ -772,6 +773,7 @@ struct mt7530_priv {
  	struct device		*dev;
  	struct dsa_switch	*ds;
  	struct mii_bus		*bus;

target/linux/generic/backport-6.1/790-v6.4-0005-net-dsa-mt7530-move-SGMII-PCS-creation-to-mt7530_pro.patch

@@ -18,7 +18,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -3031,12 +3031,6 @@ mt753x_setup(struct dsa_switch *ds)
+@@ -3045,12 +3045,6 @@ mt753x_setup(struct dsa_switch *ds)
  	if (ret && priv->irq)
  		mt7530_free_irq_common(priv);
  
@@ -31,7 +31,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	return ret;
  }
  
-@@ -3153,6 +3147,7 @@ mt7530_probe(struct mdio_device *mdiodev
+@@ -3167,6 +3161,7 @@ mt7530_probe(struct mdio_device *mdiodev
  	static struct regmap_config *regmap_config;
  	struct mt7530_priv *priv;
  	struct device_node *dn;
@@ -39,7 +39,7 @@ Signed-off-by: David S. Miller <[email protected]>
  
  	dn = mdiodev->dev.of_node;
  
-@@ -3245,6 +3240,12 @@ mt7530_probe(struct mdio_device *mdiodev
+@@ -3259,6 +3254,12 @@ mt7530_probe(struct mdio_device *mdiodev
  	if (IS_ERR(priv->regmap))
  		return PTR_ERR(priv->regmap);
  

target/linux/generic/backport-6.1/790-v6.4-0006-net-dsa-mt7530-introduce-mutex-helpers.patch

@@ -214,7 +214,7 @@ Signed-off-by: David S. Miller <[email protected]>
  
  	return ret;
  }
-@@ -1109,7 +1109,6 @@ static int
+@@ -1121,7 +1121,6 @@ static int
  mt7530_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)
  {
  	struct mt7530_priv *priv = ds->priv;
@@ -222,7 +222,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	int length;
  	u32 val;
  
-@@ -1120,7 +1119,7 @@ mt7530_port_change_mtu(struct dsa_switch
+@@ -1132,7 +1131,7 @@ mt7530_port_change_mtu(struct dsa_switch
  	if (!dsa_is_cpu_port(ds, port))
  		return 0;
  
@@ -231,7 +231,7 @@ Signed-off-by: David S. Miller <[email protected]>
  
  	val = mt7530_mii_read(priv, MT7530_GMACCR);
  	val &= ~MAX_RX_PKT_LEN_MASK;
-@@ -1141,7 +1140,7 @@ mt7530_port_change_mtu(struct dsa_switch
+@@ -1153,7 +1152,7 @@ mt7530_port_change_mtu(struct dsa_switch
  
  	mt7530_mii_write(priv, MT7530_GMACCR, val);
  
@@ -240,7 +240,7 @@ Signed-off-by: David S. Miller <[email protected]>
  
  	return 0;
  }
-@@ -1942,10 +1941,10 @@ mt7530_irq_thread_fn(int irq, void *dev_
+@@ -1954,10 +1953,10 @@ mt7530_irq_thread_fn(int irq, void *dev_
  	u32 val;
  	int p;
  
@@ -253,7 +253,7 @@ Signed-off-by: David S. Miller <[email protected]>
  
  	for (p = 0; p < MT7530_NUM_PHYS; p++) {
  		if (BIT(p) & val) {
-@@ -1981,7 +1980,7 @@ mt7530_irq_bus_lock(struct irq_data *d)
+@@ -1993,7 +1992,7 @@ mt7530_irq_bus_lock(struct irq_data *d)
  {
  	struct mt7530_priv *priv = irq_data_get_irq_chip_data(d);
  
@@ -262,7 +262,7 @@ Signed-off-by: David S. Miller <[email protected]>
  }
  
  static void
-@@ -1990,7 +1989,7 @@ mt7530_irq_bus_sync_unlock(struct irq_da
+@@ -2002,7 +2001,7 @@ mt7530_irq_bus_sync_unlock(struct irq_da
  	struct mt7530_priv *priv = irq_data_get_irq_chip_data(d);
  
  	mt7530_mii_write(priv, MT7530_SYS_INT_EN, priv->irq_enable);

target/linux/generic/backport-6.1/790-v6.4-0007-net-dsa-mt7530-move-p5_intf_modes-function-to-mt7530.patch

@@ -48,7 +48,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	struct mt7530_priv *priv = ds->priv;
 --- a/drivers/net/dsa/mt7530.h
 +++ b/drivers/net/dsa/mt7530.h
-@@ -682,24 +682,6 @@ enum p5_interface_select {
+@@ -687,24 +687,6 @@ enum p5_interface_select {
  	P5_INTF_SEL_GMAC5_SGMII,
  };
  

target/linux/generic/backport-6.1/790-v6.4-0008-net-dsa-mt7530-introduce-mt7530_probe_common-helper-.patch

@@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -3159,44 +3159,21 @@ static const struct of_device_id mt7530_
+@@ -3173,44 +3173,21 @@ static const struct of_device_id mt7530_
  MODULE_DEVICE_TABLE(of, mt7530_of_match);
  
  static int
@@ -67,7 +67,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	if (!priv->info)
  		return -EINVAL;
  
-@@ -3210,23 +3187,53 @@ mt7530_probe(struct mdio_device *mdiodev
+@@ -3224,23 +3201,53 @@ mt7530_probe(struct mdio_device *mdiodev
  		return -EINVAL;
  
  	priv->id = priv->info->id;
@@ -131,7 +131,7 @@ Signed-off-by: David S. Miller <[email protected]>
  		priv->reset = devm_gpiod_get_optional(&mdiodev->dev, "reset",
  						      GPIOD_OUT_LOW);
  		if (IS_ERR(priv->reset)) {
-@@ -3235,12 +3242,15 @@ mt7530_probe(struct mdio_device *mdiodev
+@@ -3249,12 +3256,15 @@ mt7530_probe(struct mdio_device *mdiodev
  		}
  	}
  

target/linux/generic/backport-6.1/790-v6.4-0009-net-dsa-mt7530-introduce-mt7530_remove_common-helper.patch

@@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -3277,6 +3277,17 @@ mt7530_probe(struct mdio_device *mdiodev
+@@ -3291,6 +3291,17 @@ mt7530_probe(struct mdio_device *mdiodev
  }
  
  static void
@@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <[email protected]>
  mt7530_remove(struct mdio_device *mdiodev)
  {
  	struct mt7530_priv *priv = dev_get_drvdata(&mdiodev->dev);
-@@ -3295,15 +3306,10 @@ mt7530_remove(struct mdio_device *mdiode
+@@ -3309,15 +3320,10 @@ mt7530_remove(struct mdio_device *mdiode
  		dev_err(priv->dev, "Failed to disable io pwr: %d\n",
  			ret);
  

target/linux/generic/backport-6.1/790-v6.4-0010-net-dsa-mt7530-introduce-separate-MDIO-driver.patch

@@ -416,7 +416,7 @@ Signed-off-by: David S. Miller <[email protected]>
  static u32
  mt7530_mii_read(struct mt7530_priv *priv, u32 reg)
  {
-@@ -2957,72 +2908,6 @@ static const struct phylink_pcs_ops mt75
+@@ -2971,72 +2922,6 @@ static const struct phylink_pcs_ops mt75
  	.pcs_an_restart = mt7530_pcs_an_restart,
  };
  
@@ -489,7 +489,7 @@ Signed-off-by: David S. Miller <[email protected]>
  static int
  mt753x_setup(struct dsa_switch *ds)
  {
-@@ -3081,7 +2966,7 @@ static int mt753x_set_mac_eee(struct dsa
+@@ -3095,7 +2980,7 @@ static int mt753x_set_mac_eee(struct dsa
  	return 0;
  }
  
@@ -498,7 +498,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	.get_tag_protocol	= mtk_get_tag_protocol,
  	.setup			= mt753x_setup,
  	.get_strings		= mt7530_get_strings,
-@@ -3115,8 +3000,9 @@ static const struct dsa_switch_ops mt753
+@@ -3129,8 +3014,9 @@ static const struct dsa_switch_ops mt753
  	.get_mac_eee		= mt753x_get_mac_eee,
  	.set_mac_eee		= mt753x_set_mac_eee,
  };
@@ -509,7 +509,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	[ID_MT7621] = {
  		.id = ID_MT7621,
  		.pcs_ops = &mt7530_pcs_ops,
-@@ -3149,16 +3035,9 @@ static const struct mt753x_info mt753x_t
+@@ -3163,16 +3049,9 @@ static const struct mt753x_info mt753x_t
  		.mac_port_config = mt7531_mac_config,
  	},
  };
@@ -528,7 +528,7 @@ Signed-off-by: David S. Miller <[email protected]>
  mt7530_probe_common(struct mt7530_priv *priv)
  {
  	struct device *dev = priv->dev;
-@@ -3195,88 +3074,9 @@ mt7530_probe_common(struct mt7530_priv *
+@@ -3209,88 +3088,9 @@ mt7530_probe_common(struct mt7530_priv *
  
  	return 0;
  }
@@ -619,7 +619,7 @@ Signed-off-by: David S. Miller <[email protected]>
  mt7530_remove_common(struct mt7530_priv *priv)
  {
  	if (priv->irq)
-@@ -3286,55 +3086,7 @@ mt7530_remove_common(struct mt7530_priv
+@@ -3300,55 +3100,7 @@ mt7530_remove_common(struct mt7530_priv
  
  	mutex_destroy(&priv->reg_mutex);
  }
@@ -678,7 +678,7 @@ Signed-off-by: David S. Miller <[email protected]>
  MODULE_DESCRIPTION("Driver for Mediatek MT7530 Switch");
 --- a/drivers/net/dsa/mt7530.h
 +++ b/drivers/net/dsa/mt7530.h
-@@ -807,4 +807,10 @@ static inline void INIT_MT7530_DUMMY_POL
+@@ -812,4 +812,10 @@ static inline void INIT_MT7530_DUMMY_POL
  	p->reg = reg;
  }
  

target/linux/generic/backport-6.1/790-v6.4-0012-net-dsa-mt7530-introduce-driver-for-MT7988-built-in-.patch

@@ -184,7 +184,7 @@ Signed-off-by: David S. Miller <[email protected]>
 +MODULE_LICENSE("GPL");
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -1989,6 +1989,47 @@ static const struct irq_domain_ops mt753
+@@ -2001,6 +2001,47 @@ static const struct irq_domain_ops mt753
  };
  
  static void
@@ -232,7 +232,7 @@ Signed-off-by: David S. Miller <[email protected]>
  mt7530_setup_mdio_irq(struct mt7530_priv *priv)
  {
  	struct dsa_switch *ds = priv->ds;
-@@ -2022,8 +2063,15 @@ mt7530_setup_irq(struct mt7530_priv *pri
+@@ -2034,8 +2075,15 @@ mt7530_setup_irq(struct mt7530_priv *pri
  		return priv->irq ? : -EINVAL;
  	}
  
@@ -250,7 +250,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	if (!priv->irq_domain) {
  		dev_err(dev, "failed to create IRQ domain\n");
  		return -ENOMEM;
-@@ -2520,6 +2568,25 @@ static void mt7531_mac_port_get_caps(str
+@@ -2534,6 +2582,25 @@ static void mt7531_mac_port_get_caps(str
  	}
  }
  
@@ -276,7 +276,7 @@ Signed-off-by: David S. Miller <[email protected]>
  static int
  mt753x_pad_setup(struct dsa_switch *ds, const struct phylink_link_state *state)
  {
-@@ -2596,6 +2663,17 @@ static bool mt753x_is_mac_port(u32 port)
+@@ -2610,6 +2677,17 @@ static bool mt753x_is_mac_port(u32 port)
  }
  
  static int
@@ -294,7 +294,7 @@ Signed-off-by: David S. Miller <[email protected]>
  mt7531_mac_config(struct dsa_switch *ds, int port, unsigned int mode,
  		  phy_interface_t interface)
  {
-@@ -2665,7 +2743,8 @@ mt753x_phylink_mac_config(struct dsa_swi
+@@ -2679,7 +2757,8 @@ mt753x_phylink_mac_config(struct dsa_swi
  
  	switch (port) {
  	case 0 ... 4: /* Internal phy */
@@ -304,7 +304,7 @@ Signed-off-by: David S. Miller <[email protected]>
  			goto unsupported;
  		break;
  	case 5: /* 2nd cpu port with phy of port 0 or 4 / external phy */
-@@ -2743,7 +2822,8 @@ static void mt753x_phylink_mac_link_up(s
+@@ -2757,7 +2836,8 @@ static void mt753x_phylink_mac_link_up(s
  	/* MT753x MAC works in 1G full duplex mode for all up-clocked
  	 * variants.
  	 */
@@ -314,7 +314,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	    (phy_interface_mode_is_8023z(interface))) {
  		speed = SPEED_1000;
  		duplex = DUPLEX_FULL;
-@@ -2823,6 +2903,21 @@ mt7531_cpu_port_config(struct dsa_switch
+@@ -2837,6 +2917,21 @@ mt7531_cpu_port_config(struct dsa_switch
  	return 0;
  }
  
@@ -336,7 +336,7 @@ Signed-off-by: David S. Miller <[email protected]>
  static void mt753x_phylink_get_caps(struct dsa_switch *ds, int port,
  				    struct phylink_config *config)
  {
-@@ -2968,6 +3063,27 @@ static int mt753x_set_mac_eee(struct dsa
+@@ -2982,6 +3077,27 @@ static int mt753x_set_mac_eee(struct dsa
  	return 0;
  }
  
@@ -364,7 +364,7 @@ Signed-off-by: David S. Miller <[email protected]>
  const struct dsa_switch_ops mt7530_switch_ops = {
  	.get_tag_protocol	= mtk_get_tag_protocol,
  	.setup			= mt753x_setup,
-@@ -3036,6 +3152,17 @@ const struct mt753x_info mt753x_table[]
+@@ -3050,6 +3166,17 @@ const struct mt753x_info mt753x_table[]
  		.mac_port_get_caps = mt7531_mac_port_get_caps,
  		.mac_port_config = mt7531_mac_config,
  	},
@@ -407,7 +407,7 @@ Signed-off-by: David S. Miller <[email protected]>
  					 MT7531_MIRROR_MASK : MIRROR_MASK)
  
  /* Registers for BPDU and PAE frame control*/
-@@ -295,9 +296,8 @@ enum mt7530_vlan_port_acc_frm {
+@@ -300,9 +301,8 @@ enum mt7530_vlan_port_acc_frm {
  					 MT7531_FORCE_DPX | \
  					 MT7531_FORCE_RX_FC | \
  					 MT7531_FORCE_TX_FC)

target/linux/generic/backport-6.1/790-v6.4-0013-net-dsa-mt7530-fix-support-for-MT7531BE.patch

@@ -73,7 +73,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  }
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -3030,6 +3030,12 @@ mt753x_setup(struct dsa_switch *ds)
+@@ -3044,6 +3044,12 @@ mt753x_setup(struct dsa_switch *ds)
  	if (ret && priv->irq)
  		mt7530_free_irq_common(priv);
  
@@ -88,7 +88,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  
 --- a/drivers/net/dsa/mt7530.h
 +++ b/drivers/net/dsa/mt7530.h
-@@ -741,10 +741,10 @@ struct mt753x_info {
+@@ -746,10 +746,10 @@ struct mt753x_info {
   *			registers
   * @p6_interface	Holding the current port 6 interface
   * @p5_intf_sel:	Holding the current port 5 interface select
@@ -100,7 +100,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
   */
  struct mt7530_priv {
  	struct device		*dev;
-@@ -763,7 +763,6 @@ struct mt7530_priv {
+@@ -768,7 +768,6 @@ struct mt7530_priv {
  	unsigned int		p5_intf_sel;
  	u8			mirror_rx;
  	u8			mirror_tx;
@@ -108,7 +108,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  	struct mt7530_port	ports[MT7530_NUM_PORTS];
  	struct mt753x_pcs	pcs[MT7530_NUM_PORTS];
  	/* protect among processes for registers access*/
-@@ -771,6 +770,7 @@ struct mt7530_priv {
+@@ -776,6 +775,7 @@ struct mt7530_priv {
  	int irq;
  	struct irq_domain *irq_domain;
  	u32 irq_enable;

target/linux/generic/hack-6.1/901-debloat_sock_diag.patch

@@ -79,7 +79,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  INDIRECT_CALLABLE_DECLARE(struct dst_entry *ip6_dst_check(struct dst_entry *,
  							  u32));
  INDIRECT_CALLABLE_DECLARE(struct dst_entry *ipv4_dst_check(struct dst_entry *,
-@@ -2174,9 +2188,11 @@ static void __sk_free(struct sock *sk)
+@@ -2168,9 +2182,11 @@ static void __sk_free(struct sock *sk)
  	if (likely(sk->sk_net_refcnt))
  		sock_inuse_add(sock_net(sk), -1);
  

target/linux/generic/hack-6.1/902-debloat_proc.patch

@@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -4088,6 +4088,8 @@ static __net_initdata struct pernet_oper
+@@ -4082,6 +4082,8 @@ static __net_initdata struct pernet_oper
  
  static int __init proto_init(void)
  {

target/linux/generic/pending-6.1/723-net-mt7531-ensure-all-MACs-are-powered-down-before-r.patch

@@ -15,7 +15,7 @@ Signed-off-by: Alexander Couzens <[email protected]>
 
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -2236,6 +2236,10 @@ mt7530_setup(struct dsa_switch *ds)
+@@ -2248,6 +2248,10 @@ mt7530_setup(struct dsa_switch *ds)
  		return -ENODEV;
  	}
  

target/linux/generic/pending-6.1/795-mt7530-register-OF-node-for-internal-MDIO-bus.patch

@@ -16,7 +16,7 @@ Signed-off-by: David Bauer <[email protected]>
 
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -2126,10 +2126,13 @@ mt7530_setup_mdio(struct mt7530_priv *pr
+@@ -2138,10 +2138,13 @@ mt7530_setup_mdio(struct mt7530_priv *pr
  {
  	struct dsa_switch *ds = priv->ds;
  	struct device *dev = priv->dev;
@@ -30,7 +30,7 @@ Signed-off-by: David Bauer <[email protected]>
  	bus = devm_mdiobus_alloc(dev);
  	if (!bus)
  		return -ENOMEM;
-@@ -2146,7 +2149,9 @@ mt7530_setup_mdio(struct mt7530_priv *pr
+@@ -2158,7 +2161,9 @@ mt7530_setup_mdio(struct mt7530_priv *pr
  	if (priv->irq)
  		mt7530_setup_mdio_irq(priv);