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

* https://github.com/coolsnowwolf/lede:
  kernel: bump 5.10 to 5.10.157 (coolsnowwolf#10561)
  kernel: bump 6.0 to 6.0.11 (coolsnowwolf#10556)
  kernel: bump 5.15 to 5.15.81 (coolsnowwolf#10554)

include/kernel-5.10

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .156
-LINUX_KERNEL_HASH-5.10.156 = 679e9964ca720027967391b61db990ceb7868e93e203f87724f18310f4955923
+LINUX_VERSION-5.10 = .157
+LINUX_KERNEL_HASH-5.10.157 = fc4cd7c0777ed53f1350e73877e9918df3c40d8e8abe93c6e1a0eb21556d327f

include/kernel-5.15

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .80
-LINUX_KERNEL_HASH-5.15.80 = 3b321a6466d2021f60ed8d4e33bba21db2f23efc2ddd2d9fb775393d9afdfd4d
+LINUX_VERSION-5.15 = .81
+LINUX_KERNEL_HASH-5.15.81 = 8f885cdebd754d6e63b920cf6c3e5713e91bbf5f52e9d99eb0054ef7e8f096ab

include/kernel-6.0

@@ -1,2 +1,2 @@
-LINUX_VERSION-6.0 = .10
-LINUX_KERNEL_HASH-6.0.10 = 39e57fcd84cd70bfa3e1a4185d3aa0ed7f1432f24c6548d16326b0c3c9541dd0
+LINUX_VERSION-6.0 = .11
+LINUX_KERNEL_HASH-6.0.11 = 2bae6131e64971e1e34ff395fa542971134c857bdb0b29069ab847c7c9a9c762

package/network/config/firewall/patches/100-fullconenat.patch

@@ -1,7 +1,7 @@
 index 85a3750..9fac9b1 100644
 --- a/defaults.c
 +++ b/defaults.c
-@@ -46,7 +46,9 @@ const struct fw3_option fw3_flag_opts[] = {
+@@ -48,7 +48,9 @@ const struct fw3_option fw3_flag_opts[]
  	FW3_OPT("synflood_protect",    bool,     defaults, syn_flood),
  	FW3_OPT("synflood_rate",       limit,    defaults, syn_flood_rate),
  	FW3_OPT("synflood_burst",      int,      defaults, syn_flood_rate.burst),
@@ -12,31 +12,27 @@ index 85a3750..9fac9b1 100644
  	FW3_OPT("tcp_syncookies",      bool,     defaults, tcp_syncookies),
  	FW3_OPT("tcp_ecn",             int,      defaults, tcp_ecn),
  	FW3_OPT("tcp_window_scaling",  bool,     defaults, tcp_window_scaling),
-diff --git a/options.h b/options.h
-index 6edd174..c02eb97 100644
 --- a/options.h
 +++ b/options.h
-@@ -267,6 +267,7 @@ struct fw3_defaults
- 	bool drop_invalid;
+@@ -297,6 +297,7 @@ struct fw3_defaults
+ 	enum fw3_reject_code any_reject_code;
 
  	bool syn_flood;
 +	bool fullcone;
  	struct fw3_limit syn_flood_rate;
 
  	bool tcp_syncookies;
-diff --git a/zones.c b/zones.c
-index 2aa7473..57eead0 100644
 --- a/zones.c
 +++ b/zones.c
-@@ -627,6 +627,7 @@ print_zone_rule(struct fw3_ipt_handle *h
+@@ -670,6 +670,7 @@ print_zone_rule(struct fw3_ipt_handle *h
  	struct fw3_address *msrc;
  	struct fw3_address *mdest;
  	struct fw3_ipt_rule *r;
 +	struct fw3_defaults *defs = &state->defaults;
 
  	if (!fw3_is_family(zone, handle->family))
  		return;
-@@ -712,8 +713,22 @@ print_zone_rule(struct fw3_ipt_handle *h
+@@ -755,8 +756,22 @@ print_zone_rule(struct fw3_ipt_handle *h
  				{
  					r = fw3_ipt_rule_new(handle);
  					fw3_ipt_rule_src_dest(r, msrc, mdest);

target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch

@@ -258,7 +258,7 @@ SVN-Revision: 35130
  #include <linux/uaccess.h>
  #include <linux/ipv6.h>
  #include <linux/icmpv6.h>
-@@ -924,10 +925,10 @@ static void tcp_v6_send_response(const s
+@@ -926,10 +927,10 @@ static void tcp_v6_send_response(const s
  	topt = (__be32 *)(t1 + 1);
 
  	if (tsecr) {

target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch

@@ -258,7 +258,7 @@ SVN-Revision: 35130
  #include <linux/uaccess.h>
  #include <linux/ipv6.h>
  #include <linux/icmpv6.h>
-@@ -941,10 +942,10 @@ static void tcp_v6_send_response(const s
+@@ -943,10 +944,10 @@ static void tcp_v6_send_response(const s
  	topt = (__be32 *)(t1 + 1);
 
  	if (tsecr) {

target/linux/bcm27xx/patches-5.15/950-0470-sound-usb-add-device-quirks-for-A4Tech-FHD-1080p-web.patch

@@ -22,6 +22,6 @@ Signed-off-by: Jonathan Bell <[email protected]>
  		   QUIRK_FLAG_GENERIC_IMPLICIT_FB),
 +	DEVICE_FLG(0x09da, 0x2695, /* A4Tech FHD 1080p webcam */
 +		   QUIRK_FLAG_DISABLE_AUTOSUSPEND | QUIRK_FLAG_GET_SAMPLE_RATE),
+ 	DEVICE_FLG(0x0525, 0xa4ad, /* Hamedal C20 usb camero */
+ 		   QUIRK_FLAG_IFACE_SKIP_CLOSE),
 
- 	/* Vendor matches */
- 	VENDOR_FLG(0x045e, /* MS Lifecam */

target/linux/generic/backport-5.10/610-v5.13-01-netfilter-flowtable-separate-replace-destroy-and-sta.patch

@@ -58,7 +58,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
  }
 
  static int nf_flow_table_block_setup(struct nf_flowtable *flowtable,
-@@ -1013,15 +1023,33 @@ EXPORT_SYMBOL_GPL(nf_flow_table_offload_
+@@ -1017,15 +1027,33 @@ EXPORT_SYMBOL_GPL(nf_flow_table_offload_
 
  int nf_flow_table_offload_init(void)
  {

target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch

@@ -145,7 +145,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
  					const struct net_bridge *br)
 --- a/net/bridge/br_vlan.c
 +++ b/net/bridge/br_vlan.c
-@@ -1327,6 +1327,59 @@ int br_vlan_get_pvid_rcu(const struct ne
+@@ -1350,6 +1350,59 @@ int br_vlan_get_pvid_rcu(const struct ne
  }
  EXPORT_SYMBOL_GPL(br_vlan_get_pvid_rcu);
 

target/linux/generic/backport-5.10/610-v5.13-27-netfilter-flowtable-bridge-vlan-hardware-offload-and.patch

@@ -57,7 +57,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
  		break;
 --- a/net/bridge/br_vlan.c
 +++ b/net/bridge/br_vlan.c
-@@ -1374,6 +1374,8 @@ int br_vlan_fill_forward_path_mode(struc
+@@ -1397,6 +1397,8 @@ int br_vlan_fill_forward_path_mode(struc
 
  	if (path->bridge.vlan_mode == DEV_PATH_BR_VLAN_TAG)
  		path->bridge.vlan_mode = DEV_PATH_BR_VLAN_KEEP;

target/linux/generic/backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch

@@ -27,7 +27,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
  obj-$(CONFIG_NET_MEDIATEK_STAR_EMAC) += mtk_star_emac.o
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -2299,12 +2299,17 @@ static int mtk_open(struct net_device *d
+@@ -2299,15 +2299,20 @@ static int mtk_open(struct net_device *d
 
  	/* we run 2 netdevs on the same dma ring so we only bring it up once */
  	if (!refcount_read(&eth->dma_refcnt)) {
@@ -37,7 +37,10 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
 
 +		err = mtk_start_dma(eth);
  		if (err)
+ 		if (err) {
+ 			phylink_disconnect_phy(mac->phylink);
  			return err;
+ 		}
 
 -		mtk_gdm_config(eth, MTK_GDMA_TO_PDMA);
 +		if (eth->soc->offload_version && mtk_ppe_start(&eth->ppe) == 0)
@@ -47,7 +50,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
 
  		napi_enable(&eth->tx_napi);
  		napi_enable(&eth->rx_napi);
-@@ -2371,6 +2376,9 @@ static int mtk_stop(struct net_device *d
+@@ -2374,6 +2379,9 @@ static int mtk_stop(struct net_device *d
 
  	mtk_dma_free(eth);
 
@@ -57,7 +60,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
  	return 0;
  }
 
-@@ -3099,6 +3107,13 @@ static int mtk_probe(struct platform_dev
+@@ -3102,6 +3110,13 @@ static int mtk_probe(struct platform_dev
  			goto err_free_dev;
  	}
 
@@ -71,15 +74,15 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
  	for (i = 0; i < MTK_MAX_DEVS; i++) {
  		if (!eth->netdev[i])
  			continue;
-@@ -3173,6 +3188,7 @@ static const struct mtk_soc_data mt7621_
+@@ -3176,6 +3191,7 @@ static const struct mtk_soc_data mt7621_
  	.hw_features = MTK_HW_FEATURES,
  	.required_clks = MT7621_CLKS_BITMAP,
  	.required_pctl = false,
 +	.offload_version = 2,
  };
 
  static const struct mtk_soc_data mt7622_data = {
-@@ -3181,6 +3197,7 @@ static const struct mtk_soc_data mt7622_
+@@ -3184,6 +3200,7 @@ static const struct mtk_soc_data mt7622_
  	.hw_features = MTK_HW_FEATURES,
  	.required_clks = MT7622_CLKS_BITMAP,
  	.required_pctl = false,

target/linux/generic/backport-5.10/610-v5.13-33-net-ethernet-mtk_eth_soc-add-flow-offloading-support.patch

@@ -21,15 +21,15 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
  obj-$(CONFIG_NET_MEDIATEK_STAR_EMAC) += mtk_star_emac.o
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -2854,6 +2854,7 @@ static const struct net_device_ops mtk_n
+@@ -2857,6 +2857,7 @@ static const struct net_device_ops mtk_n
  #ifdef CONFIG_NET_POLL_CONTROLLER
  	.ndo_poll_controller	= mtk_poll_controller,
  #endif
 +	.ndo_setup_tc		= mtk_eth_setup_tc,
  };
 
  static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
-@@ -3112,6 +3113,10 @@ static int mtk_probe(struct platform_dev
+@@ -3115,6 +3116,10 @@ static int mtk_probe(struct platform_dev
  				   eth->base + MTK_ETH_PPE_BASE, 2);
  		if (err)
  			goto err_free_dev;

target/linux/generic/backport-5.10/610-v5.13-45-net-ethernet-mtk_eth_soc-implement-dynamic-interrupt.patch

@@ -103,7 +103,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	if (likely(napi_schedule_prep(&eth->tx_napi))) {
  		__napi_schedule(&eth->tx_napi);
  		mtk_tx_irq_disable(eth, MTK_TX_DONE_INT);
-@@ -2366,6 +2383,9 @@ static int mtk_stop(struct net_device *d
+@@ -2369,6 +2386,9 @@ static int mtk_stop(struct net_device *d
  	napi_disable(&eth->tx_napi);
  	napi_disable(&eth->rx_napi);
 
@@ -113,7 +113,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA))
  		mtk_stop_dma(eth, MTK_QDMA_GLO_CFG);
  	mtk_stop_dma(eth, MTK_PDMA_GLO_CFG);
-@@ -2418,6 +2438,64 @@ err_disable_clks:
+@@ -2421,6 +2441,64 @@ err_disable_clks:
  	return ret;
  }
 
@@ -178,7 +178,7 @@ Signed-off-by: David S. Miller <[email protected]>
  static int mtk_hw_init(struct mtk_eth *eth)
  {
  	int i, val, ret;
-@@ -2439,9 +2517,6 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -2442,9 +2520,6 @@ static int mtk_hw_init(struct mtk_eth *e
  			goto err_disable_pm;
  		}
 
@@ -188,7 +188,7 @@ Signed-off-by: David S. Miller <[email protected]>
  		/* disable delay and normal interrupt */
  		mtk_tx_irq_disable(eth, ~0);
  		mtk_rx_irq_disable(eth, ~0);
-@@ -2480,11 +2555,11 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -2483,11 +2558,11 @@ static int mtk_hw_init(struct mtk_eth *e
  	/* Enable RX VLan Offloading */
  	mtk_w32(eth, 1, MTK_CDMP_EG_CTRL);
 
@@ -203,7 +203,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	mtk_tx_irq_disable(eth, ~0);
  	mtk_rx_irq_disable(eth, ~0);
 
-@@ -2989,6 +3064,13 @@ static int mtk_probe(struct platform_dev
+@@ -2992,6 +3067,13 @@ static int mtk_probe(struct platform_dev
  	spin_lock_init(&eth->page_lock);
  	spin_lock_init(&eth->tx_irq_lock);
  	spin_lock_init(&eth->rx_irq_lock);

target/linux/generic/backport-5.10/611-v5.12-net-ethernet-mediatek-support-setting-MTU.patch

@@ -48,7 +48,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
 
  	return buf_size;
  }
-@@ -2626,6 +2626,35 @@ static void mtk_uninit(struct net_device
+@@ -2629,6 +2629,35 @@ static void mtk_uninit(struct net_device
  	mtk_rx_irq_disable(eth, ~0);
  }
 
@@ -84,15 +84,15 @@ Signed-off-by: Jakub Kicinski <[email protected]>
  static int mtk_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
  {
  	struct mtk_mac *mac = netdev_priv(dev);
-@@ -2922,6 +2951,7 @@ static const struct net_device_ops mtk_n
+@@ -2925,6 +2954,7 @@ static const struct net_device_ops mtk_n
  	.ndo_set_mac_address	= mtk_set_mac_address,
  	.ndo_validate_addr	= eth_validate_addr,
  	.ndo_do_ioctl		= mtk_do_ioctl,
 +	.ndo_change_mtu		= mtk_change_mtu,
  	.ndo_tx_timeout		= mtk_tx_timeout,
  	.ndo_get_stats64        = mtk_get_stats64,
  	.ndo_fix_features	= mtk_fix_features,
-@@ -3024,7 +3054,10 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -3027,7 +3057,10 @@ static int mtk_add_mac(struct mtk_eth *e
  	eth->netdev[id]->irq = eth->irq[0];
  	eth->netdev[id]->dev.of_node = np;
 

target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch

@@ -476,15 +476,15 @@ Signed-off-by: David S. Miller <[email protected]>
  	p->phy_np = of_parse_phandle(pdev->dev.of_node, "phy-handle", 0);
 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
 +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
-@@ -1474,7 +1474,6 @@ static int bgx_init_of_phy(struct bgx *b
+@@ -1476,7 +1476,6 @@ static int bgx_init_of_phy(struct bgx *b
  	device_for_each_child_node(&bgx->pdev->dev, fwn) {
  		struct phy_device *pd;
  		struct device_node *phy_np;
 -		const char *mac;
 
  		/* Should always be an OF node.  But if it is not, we
  		 * cannot handle it, so exit the loop.
-@@ -1483,9 +1482,7 @@ static int bgx_init_of_phy(struct bgx *b
+@@ -1485,9 +1484,7 @@ static int bgx_init_of_phy(struct bgx *b
  		if (!node)
  			break;
 
@@ -895,7 +895,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -2600,14 +2600,11 @@ static int __init mtk_init(struct net_de
+@@ -2603,14 +2603,11 @@ static int __init mtk_init(struct net_de
  {
  	struct mtk_mac *mac = netdev_priv(dev);
  	struct mtk_eth *eth = mac->hw;

target/linux/generic/backport-5.15/020-v6.1-03-mm-vmscan.c-refactor-shrink_node.patch

@@ -119,15 +119,15 @@ Change-Id: Iae734b5b4030205b7db6e8c841f747b6f6ae1a04
  /*
   * Determine how aggressively the anon and file LRU lists should be
   * scanned.  The relative value of each set of LRU lists is determined
-@@ -3032,7 +3129,6 @@ static void shrink_node(pg_data_t *pgdat
+@@ -3030,7 +3127,6 @@ static void shrink_node(pg_data_t *pgdat
  	unsigned long nr_reclaimed, nr_scanned;
  	struct lruvec *target_lruvec;
  	bool reclaimable = false;
 -	unsigned long file;
 
  	target_lruvec = mem_cgroup_lruvec(sc->target_mem_cgroup, pgdat);
 
-@@ -3048,93 +3144,7 @@ again:
+@@ -3046,93 +3142,7 @@ again:
  	nr_reclaimed = sc->nr_reclaimed;
  	nr_scanned = sc->nr_scanned;
 

target/linux/generic/backport-5.15/020-v6.1-06-mm-multigenerational-lru-aging.patch

@@ -1162,7 +1162,7 @@ Change-Id: I3ae8abc3100d023cecb3a699d86020ae6fc10a45
  #endif /* CONFIG_LRU_GEN */
 
  static void shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc)
-@@ -4333,6 +5276,11 @@ static void age_active_anon(struct pglis
+@@ -4331,6 +5274,11 @@ static void age_active_anon(struct pglis
  	struct mem_cgroup *memcg;
  	struct lruvec *lruvec;
 

target/linux/generic/backport-5.15/020-v6.1-07-mm-multigenerational-lru-eviction.patch

@@ -821,8 +821,8 @@ Change-Id: I64c06d8f2cdb83ac7d56c7e1d07f043483956cac
 
  static void shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc)
 @@ -4433,6 +4978,11 @@ static void shrink_lruvec(struct lruvec
+ 	bool proportional_reclaim;
  	struct blk_plug plug;
- 	bool scan_adjusted;
 
 +	if (lru_gen_enabled()) {
 +		lru_gen_shrink_lruvec(lruvec, sc);
@@ -832,7 +832,7 @@ Change-Id: I64c06d8f2cdb83ac7d56c7e1d07f043483956cac
  	get_scan_count(lruvec, sc, nr);
 
  	/* Record the original scan target for proportional adjustments later */
-@@ -4906,6 +5456,9 @@ static void snapshot_refaults(struct mem
+@@ -4904,6 +5454,9 @@ static void snapshot_refaults(struct mem
  	struct lruvec *target_lruvec;
  	unsigned long refaults;
 

target/linux/generic/backport-5.15/702-v5.19-00-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch

@@ -205,7 +205,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  				  MTK_DMA_SIZE * sizeof(struct mtk_tx_dma),
  				  eth->scratch_ring,
  				  eth->phy_scratch_ring);
-@@ -2511,6 +2512,8 @@ static void mtk_dim_tx(struct work_struc
+@@ -2513,6 +2514,8 @@ static void mtk_dim_tx(struct work_struc
 
  static int mtk_hw_init(struct mtk_eth *eth)
  {
@@ -214,7 +214,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	int i, val, ret;
 
  	if (test_and_set_bit(MTK_HW_INIT, &eth->state))
-@@ -2523,6 +2526,10 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -2525,6 +2528,10 @@ static int mtk_hw_init(struct mtk_eth *e
  	if (ret)
  		goto err_disable_pm;
 
@@ -225,7 +225,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) {
  		ret = device_reset(eth->dev);
  		if (ret) {
-@@ -3076,6 +3083,35 @@ free_netdev:
+@@ -3078,6 +3085,35 @@ free_netdev:
  	return err;
  }
 
@@ -261,15 +261,15 @@ Signed-off-by: Felix Fietkau <[email protected]>
  static int mtk_probe(struct platform_device *pdev)
  {
  	struct device_node *mac_np;
-@@ -3089,6 +3125,7 @@ static int mtk_probe(struct platform_dev
+@@ -3091,6 +3127,7 @@ static int mtk_probe(struct platform_dev
  	eth->soc = of_device_get_match_data(&pdev->dev);
 
  	eth->dev = &pdev->dev;
 +	eth->dma_dev = &pdev->dev;
  	eth->base = devm_platform_ioremap_resource(pdev, 0);
  	if (IS_ERR(eth->base))
  		return PTR_ERR(eth->base);
-@@ -3137,6 +3174,16 @@ static int mtk_probe(struct platform_dev
+@@ -3139,6 +3176,16 @@ static int mtk_probe(struct platform_dev
  		}
  	}
 

target/linux/generic/backport-5.15/702-v5.19-02-net-ethernet-mtk_eth_soc-add-support-for-Wireless-Et.patch

@@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
  static int mtk_msg_level = -1;
  module_param_named(msg_level, mtk_msg_level, int, 0);
-@@ -3206,6 +3207,22 @@ static int mtk_probe(struct platform_dev
+@@ -3208,6 +3209,22 @@ static int mtk_probe(struct platform_dev
  		}
  	}