[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede:
  kernel: bump 6.1 to 6.1.81 (coolsnowwolf#11955)
  kernel: bump 6.6 to 6.6.21 (coolsnowwolf#11954)

include/kernel-6.1

@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .80
-LINUX_KERNEL_HASH-6.1.80 = 568ecaaebb8b87c7c8246bba67bc83402972bf34f5811651a2d3cd548ff7b671
+LINUX_VERSION-6.1 = .81
+LINUX_KERNEL_HASH-6.1.81 = 0ebd861c6fd47bb0a9d3a09664d704833d1a54750c7bf9c4ad8b5e9cbd49342b

include/kernel-6.6

@@ -1,2 +1,2 @@
-LINUX_VERSION-6.6 = .19
-LINUX_KERNEL_HASH-6.6.19 = b5637e6b72c2b4b12e7db790bc155d141a9c2fe4b25f7b215410107e8747139a
+LINUX_VERSION-6.6 = .21
+LINUX_KERNEL_HASH-6.6.21 = ee0b430148da94d2b13608b8d80b007b7d281dc90e3f19b63cf9a9943810e457

target/linux/bcm27xx/patches-6.1/950-0100-lan78xx-Enable-LEDs-and-auto-negotiation.patch

@@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -2881,6 +2881,11 @@ static int lan78xx_reset(struct lan78xx_
+@@ -2883,6 +2883,11 @@ static int lan78xx_reset(struct lan78xx_
  	int ret;
  	u32 buf;
  	u8 sig;
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
  	ret = lan78xx_read_reg(dev, HW_CFG, &buf);
  	if (ret < 0)
-@@ -2945,6 +2950,10 @@ static int lan78xx_reset(struct lan78xx_
+@@ -2947,6 +2952,10 @@ static int lan78xx_reset(struct lan78xx_
 
  	buf |= HW_CFG_MEF_;
 
@@ -37,7 +37,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  	ret = lan78xx_write_reg(dev, HW_CFG, buf);
  	if (ret < 0)
  		return ret;
-@@ -3043,6 +3052,9 @@ static int lan78xx_reset(struct lan78xx_
+@@ -3046,6 +3055,9 @@ static int lan78xx_reset(struct lan78xx_
  			buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_;
  		}
  	}

target/linux/bcm27xx/patches-6.1/950-0137-lan78xx-Read-initial-EEE-status-from-DT.patch

@@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -3108,6 +3108,22 @@ static int lan78xx_open(struct net_devic
+@@ -3111,6 +3111,22 @@ static int lan78xx_open(struct net_devic
 
  	netif_dbg(dev, ifup, dev->net, "phy initialised successfully");
 

target/linux/bcm27xx/patches-6.1/950-0142-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch

@@ -37,7 +37,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
  {
  	u32 *buf;
-@@ -3467,8 +3476,14 @@ static int lan78xx_bind(struct lan78xx_n
+@@ -3470,8 +3479,14 @@ static int lan78xx_bind(struct lan78xx_n
  	if (DEFAULT_RX_CSUM_ENABLE)
  		dev->net->features |= NETIF_F_RXCSUM;
 

target/linux/bcm27xx/patches-6.1/950-0143-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch

@@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -2417,6 +2417,22 @@ static int lan78xx_phy_init(struct lan78
+@@ -2419,6 +2419,22 @@ static int lan78xx_phy_init(struct lan78
  	mii_adv_to_linkmode_adv_t(fc, mii_adv);
  	linkmode_or(phydev->advertising, fc, phydev->advertising);
 
@@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  	if (phydev->mdio.dev.of_node) {
  		u32 reg;
  		int len;
-@@ -3117,22 +3133,6 @@ static int lan78xx_open(struct net_devic
+@@ -3120,22 +3136,6 @@ static int lan78xx_open(struct net_devic
 
  	netif_dbg(dev, ifup, dev->net, "phy initialised successfully");
 

target/linux/bcm27xx/patches-6.1/950-0152-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch

@@ -28,7 +28,7 @@ See: https://github.com/raspberrypi/linux/issues/2447
  static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
  {
  	u32 *buf;
-@@ -4454,7 +4459,13 @@ static int lan78xx_probe(struct usb_inte
+@@ -4457,7 +4462,13 @@ static int lan78xx_probe(struct usb_inte
  	if (ret < 0)
  		goto out4;
 

target/linux/bcm27xx/patches-6.1/950-0153-lan78xx-EEE-support-is-now-a-PHY-property.patch

@@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -2422,7 +2422,7 @@ static int lan78xx_phy_init(struct lan78
+@@ -2424,7 +2424,7 @@ static int lan78xx_phy_init(struct lan78
  	mii_adv_to_linkmode_adv_t(fc, mii_adv);
  	linkmode_or(phydev->advertising, fc, phydev->advertising);
 

target/linux/bcm27xx/patches-6.1/950-0195-media-i2c-imx477-Support-for-the-Sony-IMX477-sensor.patch

@@ -343,7 +343,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
 +...
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -19280,6 +19280,14 @@ T:	git git://linuxtv.org/media_tree.git
+@@ -19287,6 +19287,14 @@ T:	git git://linuxtv.org/media_tree.git
  F:	Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
  F:	drivers/media/i2c/imx412.c
 

target/linux/bcm27xx/patches-6.1/950-0196-media-i2c-imx519-Support-for-the-Sony-IMX519-sensor.patch

@@ -177,7 +177,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 +...
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -19288,6 +19288,14 @@ T:	git git://linuxtv.org/media_tree.git
+@@ -19295,6 +19295,14 @@ T:	git git://linuxtv.org/media_tree.git
  F:	Documentation/devicetree/bindings/media/i2c/imx477.yaml
  F:	drivers/media/i2c/imx477.c
 

target/linux/bcm27xx/patches-6.1/950-0197-Documentation-devicetree-Add-documentation-for-imx37.patch

@@ -132,7 +132,7 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
 +...
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -19285,6 +19285,7 @@ M:	Raspberry Pi Kernel Maintenance <kern
+@@ -19292,6 +19292,7 @@ M:	Raspberry Pi Kernel Maintenance <kern
  L:	linux-media@vger.kernel.org
  S:	Maintained
  T:	git git://linuxtv.org/media_tree.git

target/linux/bcm27xx/patches-6.1/950-0379-Patching-lan78xx-for-SOF_TIMESTAMPING_TX_SOFTWARE-su.patch

@@ -10,7 +10,7 @@ Subject: [PATCH] Patching lan78xx for SOF_TIMESTAMPING_TX_SOFTWARE
 
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
-@@ -1953,6 +1953,7 @@ static const struct ethtool_ops lan78xx_
+@@ -1955,6 +1955,7 @@ static const struct ethtool_ops lan78xx_
  	.set_link_ksettings = lan78xx_set_link_ksettings,
  	.get_regs_len	= lan78xx_get_regs_len,
  	.get_regs	= lan78xx_get_regs,

target/linux/bcm27xx/patches-6.1/950-0528-dtbindings-media-i2c-Add-IMX708-CMOS-sensor-binding.patch

@@ -138,7 +138,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 +...
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -19329,6 +19329,14 @@ T:	git git://linuxtv.org/media_tree.git
+@@ -19336,6 +19336,14 @@ T:	git git://linuxtv.org/media_tree.git
  F:	Documentation/devicetree/bindings/media/i2c/imx519.yaml
  F:	drivers/media/i2c/imx519.c
 

target/linux/bcm27xx/patches-6.1/950-0593-dt-bindings-media-i2c-Add-IMX296-CMOS-sensor-binding.patch

@@ -128,7 +128,7 @@ Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
 +...
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -19271,6 +19271,14 @@ T:	git git://linuxtv.org/media_tree.git
+@@ -19278,6 +19278,14 @@ T:	git git://linuxtv.org/media_tree.git
  F:	Documentation/devicetree/bindings/media/i2c/imx290.txt
  F:	drivers/media/i2c/imx290.c
 

target/linux/bcm27xx/patches-6.1/950-0594-media-i2c-IMX296-camera-sensor-driver.patch

@@ -23,7 +23,7 @@ Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -19278,6 +19278,7 @@ L:	linux-media@vger.kernel.org
+@@ -19285,6 +19285,7 @@ L:	linux-media@vger.kernel.org
  S:	Maintained
  T:	git git://linuxtv.org/media_tree.git
  F:	Documentation/devicetree/bindings/media/i2c/sony,imx296.yaml

target/linux/bcm27xx/patches-6.1/950-0649-media-dt-bindings-Convert-imx290.txt-to-YAML.patch

@@ -219,7 +219,7 @@ Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
 +...
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -19268,7 +19268,7 @@ M:	Manivannan Sadhasivam <manivannan.sad
+@@ -19275,7 +19275,7 @@ M:	Manivannan Sadhasivam <manivannan.sad
  L:	linux-media@vger.kernel.org
  S:	Maintained
  T:	git git://linuxtv.org/media_tree.git

target/linux/bcm27xx/patches-6.1/950-0676-dt-bindings-media-i2c-Replace-IMX708-sensor-binding-.patch

@@ -271,7 +271,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
 +...
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -19343,7 +19343,7 @@ M:	Raspberry Pi Kernel Maintenance <kern
+@@ -19350,7 +19350,7 @@ M:	Raspberry Pi Kernel Maintenance <kern
  L:	linux-media@vger.kernel.org
  S:	Maintained
  T:	git git://linuxtv.org/media_tree.git

target/linux/bcm27xx/patches-6.1/950-1194-media-dt-bindings-i2c-Add-Rohm-BU64754-bindings.patch

@@ -67,7 +67,7 @@ Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
 +...
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -17894,6 +17894,13 @@ S:	Maintained
+@@ -17901,6 +17901,13 @@ S:	Maintained
  F:	Documentation/devicetree/bindings/iio/light/bh1750.yaml
  F:	drivers/iio/light/bh1750.c
 

target/linux/bcm27xx/patches-6.1/950-1195-media-i2c-Add-driver-for-OmniVision-OV64A40.patch

@@ -16,7 +16,7 @@ Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -15320,6 +15320,14 @@ S:	Maintained
+@@ -15327,6 +15327,14 @@ S:	Maintained
  T:	git git://linuxtv.org/media_tree.git
  F:	drivers/media/i2c/ov5695.c
 

target/linux/generic/backport-6.1/723-v6.3-net-pcs-add-driver-for-MediaTek-SGMII-PCS.patch

@@ -32,7 +32,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -12928,6 +12928,14 @@ L:	netdev@vger.kernel.org
+@@ -12935,6 +12935,14 @@ L:	netdev@vger.kernel.org
  S:	Maintained
  F:	drivers/net/ethernet/mediatek/
 

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

@@ -25,7 +25,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -13062,6 +13062,7 @@ M:	Landen Chao <Landen.Chao@mediatek.com
+@@ -13069,6 +13069,7 @@ M:	Landen Chao <Landen.Chao@mediatek.com
  M:	DENG Qingfang <dqfext@gmail.com>
  L:	netdev@vger.kernel.org
  S:	Maintained

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

@@ -28,7 +28,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -13060,9 +13060,11 @@ MEDIATEK SWITCH DRIVER
+@@ -13067,9 +13067,11 @@ MEDIATEK SWITCH DRIVER
  M:	Sean Wang <sean.wang@mediatek.com>
  M:	Landen Chao <Landen.Chao@mediatek.com>
  M:	DENG Qingfang <dqfext@gmail.com>

target/linux/generic/hack-6.1/952-add-net-conntrack-events-support-multiple-registrant.patch

@@ -123,7 +123,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  	depends on NETFILTER_ADVANCED
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
-@@ -2811,6 +2811,10 @@ int nf_conntrack_init_net(struct net *ne
+@@ -2824,6 +2824,10 @@ int nf_conntrack_init_net(struct net *ne
  	nf_conntrack_ecache_pernet_init(net);
  	nf_conntrack_proto_pernet_init(net);
 

target/linux/generic/hack-6.6/952-add-net-conntrack-events-support-multiple-registrant.patch

@@ -123,7 +123,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  	depends on NETFILTER_ADVANCED
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
-@@ -2800,6 +2800,10 @@ int nf_conntrack_init_net(struct net *ne
+@@ -2801,6 +2801,10 @@ int nf_conntrack_init_net(struct net *ne
  	nf_conntrack_ecache_pernet_init(net);
  	nf_conntrack_proto_pernet_init(net);
 

target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch

@@ -25,7 +25,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
  	/*
  	 * Get the required data from the packet.
  	 */
-@@ -1259,7 +1263,7 @@ int nf_conntrack_tcp_packet(struct nf_co
+@@ -1294,7 +1298,7 @@ int nf_conntrack_tcp_packet(struct nf_co
  		 IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED &&
  		 timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK])
  		timeout = timeouts[TCP_CONNTRACK_UNACK];
@@ -34,7 +34,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
  		 timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS])
  		timeout = timeouts[TCP_CONNTRACK_RETRANS];
  	else
-@@ -1575,6 +1579,9 @@ void nf_conntrack_tcp_init_net(struct ne
+@@ -1610,6 +1614,9 @@ void nf_conntrack_tcp_init_net(struct ne
  	 */
  	tn->tcp_be_liberal = 0;
 

target/linux/generic/pending-6.1/704-netfilter-nf_tables-fix-bidirectional-offload-regres.patch

@@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/net/netfilter/nft_flow_offload.c
 +++ b/net/netfilter/nft_flow_offload.c
-@@ -357,6 +357,7 @@ static void nft_flow_offload_eval(const
+@@ -361,6 +361,7 @@ static void nft_flow_offload_eval(const
  		ct->proto.tcp.seen[1].flags |= IP_CT_TCP_FLAG_BE_LIBERAL;
  	}
 

target/linux/mediatek/patches-6.1/730-v6.5-net-phy-add-driver-for-MediaTek-SoC-built-in-GE-PHYs.patch

@@ -24,7 +24,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -12936,6 +12936,15 @@ S:	Maintained
+@@ -12943,6 +12943,15 @@ S:	Maintained
  F:	drivers/net/pcs/pcs-mtk-lynxi.c
  F:	include/linux/pcs/pcs-mtk-lynxi.h
 

target/linux/meson/patches-6.1/903-add-dts-and-identify-emmc.patch

@@ -10,7 +10,7 @@
  	pxa168-aspenite.dtb \
 --- a/drivers/mmc/core/mmc.c
 +++ b/drivers/mmc/core/mmc.c
-@@ -1396,12 +1396,13 @@ static int mmc_select_hs400es(struct mmc
+@@ -1398,12 +1398,13 @@ static int mmc_select_hs400es(struct mmc
  	 * SEND_STATUS reliably at the initial frequency.
  	 */
  	mmc_set_timing(host, MMC_TIMING_MMC_HS);
@@ -25,7 +25,7 @@
  	/* Switch card to DDR with strobe bit */
  	val = EXT_CSD_DDR_BUS_WIDTH_8 | EXT_CSD_BUS_WIDTH_STROBE;
  	err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
-@@ -1459,7 +1460,7 @@ out_err:
+@@ -1461,7 +1462,7 @@ out_err:
  static int mmc_select_hs200(struct mmc_card *card)
  {
  	struct mmc_host *host = card->host;
@@ -34,7 +34,7 @@
  	int err = -EINVAL;
  	u8 val;
 
-@@ -1498,9 +1499,7 @@ static int mmc_select_hs200(struct mmc_c
+@@ -1500,9 +1501,7 @@ static int mmc_select_hs200(struct mmc_c
  		 * successfully switched over.
  		 */
  		old_timing = host->ios.timing;
@@ -44,7 +44,7 @@
 
  		/*
  		 * For HS200, CRC errors are not a reliable way to know the
-@@ -1513,10 +1512,8 @@ static int mmc_select_hs200(struct mmc_c
+@@ -1515,10 +1514,8 @@ static int mmc_select_hs200(struct mmc_c
  		 * mmc_select_timing() assumes timing has not changed if
  		 * it is a switch error.
  		 */

target/linux/rockchip/patches-6.1/011-v6.2-net-phy-Add-driver-for-Motorcomm-yt8521.patch

@@ -21,7 +21,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -13964,6 +13964,7 @@ F:	include/uapi/linux/meye.h
+@@ -13971,6 +13971,7 @@ F:	include/uapi/linux/meye.h
 
  MOTORCOMM PHY DRIVER
  M:	Peter Geis <pgwipeout@gmail.com>

target/linux/rockchip/patches-6.1/603-net-ethernet-stmmac-add-devname-configuration-from-OF.patch

@@ -1,14 +1,14 @@
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -7085,6 +7085,7 @@ int stmmac_dvr_probe(struct device *devi
+@@ -7074,6 +7074,7 @@ int stmmac_dvr_probe(struct device *devi
  {
  	struct net_device *ndev = NULL;
  	struct stmmac_priv *priv;
 +	const char *devname = of_get_property(device->of_node, "label", NULL);
  	u32 rxq;
  	int i, ret = 0;
 
-@@ -7093,6 +7094,9 @@ int stmmac_dvr_probe(struct device *devi
+@@ -7082,6 +7083,9 @@ int stmmac_dvr_probe(struct device *devi
  	if (!ndev)
  		return -ENOMEM;