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

* https://github.com/coolsnowwolf/lede:
  kernel: bump 5.10 to 5.10.199

include/kernel-5.10

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .198
-LINUX_KERNEL_HASH-5.10.198 = 2b141fce994364fbbf137b01e7910d3518b8cdbdf18f1811b48470ab4ce2fa05
+LINUX_VERSION-5.10 = .199
+LINUX_KERNEL_HASH-5.10.199 = a0ea77a1f5eeb1387d62e7a8df585ffc53758e4da153d98224ccd833bd2624c1

target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch

@@ -43,7 +43,7 @@ produce a noisy warning.
  		hcd->msi_enabled = 1;
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -1904,6 +1904,7 @@ struct xhci_hcd {
+@@ -1903,6 +1903,7 @@ struct xhci_hcd {
  	struct xhci_hub		usb2_rhub;
  	struct xhci_hub		usb3_rhub;
  	/* support xHCI 1.0 spec USB2 hardware LPM */

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

@@ -1036,7 +1036,7 @@ Signed-off-by: David S. Miller <[email protected]>
  		u32 mahr = ravb_read(ndev, MAHR);
  		u32 malr = ravb_read(ndev, MALR);
 
-@@ -2189,7 +2191,7 @@ static int ravb_probe(struct platform_de
+@@ -2191,7 +2193,7 @@ static int ravb_probe(struct platform_de
  	priv->msg_enable = RAVB_DEF_MSG_ENABLE;
 
  	/* Read and set MAC address */
@@ -1316,7 +1316,7 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
-@@ -371,7 +371,7 @@ static int stm32_dwmac_probe(struct plat
+@@ -373,7 +373,7 @@ static int stm32_dwmac_probe(struct plat
  	if (ret)
  		return ret;
 
@@ -1420,15 +1420,15 @@ Signed-off-by: David S. Miller <[email protected]>
 
 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
 +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
-@@ -1713,7 +1713,6 @@ static int am65_cpsw_nuss_init_slave_por
+@@ -1714,7 +1714,6 @@ static int am65_cpsw_nuss_init_slave_por
 
  	for_each_child_of_node(node, port_np) {
  		struct am65_cpsw_port *port;
 -		const void *mac_addr;
  		u32 port_id;
 
  		/* it is not a slave port node, continue */
-@@ -1796,15 +1795,15 @@ static int am65_cpsw_nuss_init_slave_por
+@@ -1797,15 +1796,15 @@ static int am65_cpsw_nuss_init_slave_por
  			goto of_node_put;
  		}
 

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

@@ -341,7 +341,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/net/ipv4/fib_trie.c
 +++ b/net/ipv4/fib_trie.c
-@@ -2988,11 +2988,13 @@ static const struct seq_operations fib_r
+@@ -2993,11 +2993,13 @@ static const struct seq_operations fib_r
 
  int __net_init fib_proc_init(struct net *net)
  {
@@ -357,7 +357,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  			fib_triestat_seq_show, NULL))
  		goto out2;
 
-@@ -3003,17 +3005,21 @@ int __net_init fib_proc_init(struct net
+@@ -3008,17 +3010,21 @@ int __net_init fib_proc_init(struct net
  	return 0;
 
  out3:

target/linux/generic/pending-5.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch

@@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle <[email protected]>
 
 --- a/drivers/mtd/ubi/build.c
 +++ b/drivers/mtd/ubi/build.c
-@@ -1201,6 +1201,73 @@ static struct mtd_info * __init open_mtd
+@@ -1208,6 +1208,73 @@ static struct mtd_info * __init open_mtd
  	return mtd;
  }
 
@@ -82,7 +82,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  static int __init ubi_init(void)
  {
  	int err, i, k;
-@@ -1284,6 +1351,12 @@ static int __init ubi_init(void)
+@@ -1291,6 +1358,12 @@ static int __init ubi_init(void)
  		}
  	}
 

target/linux/generic/pending-5.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch

@@ -66,7 +66,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  static void rt_fibinfo_free(struct rtable __rcu **rtp)
 --- a/net/ipv4/fib_trie.c
 +++ b/net/ipv4/fib_trie.c
-@@ -2736,6 +2736,7 @@ static const char *const rtn_type_names[
+@@ -2741,6 +2741,7 @@ static const char *const rtn_type_names[
  	[RTN_THROW] = "THROW",
  	[RTN_NAT] = "NAT",
  	[RTN_XRESOLVE] = "XRESOLVE",