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

* https://github.com/coolsnowwolf/lede:
  x86: add CheShi R69S ( Cnction N4500 ) support (coolsnowwolf#10007)
  rockchip: fix Firefly Station P2 sata support
  rockchip: add r66s vop support
  rockchip: fix r66s gpio-regulator error
  kernel: fix linux 5.19 shortcut-sfe kernel panic issue
  rockchip: backport rk3568 support to kernel 5.15 from immortalwrt
  kernel: 5.10: refresh all patches (coolsnowwolf#10005)
  kernel: 5.15: fix bug in patch format (coolsnowwolf#10006)
  kernel: bump 5.15 to 5.15.63 (coolsnowwolf#9999)
  kernel: bump 5.10 to 5.10.138 (coolsnowwolf#9998)

include/kernel-5.10

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .137
-LINUX_KERNEL_HASH-5.10.137 = c16bcd4d1453d7e645007d0a25270f52401331c7df81c364f57bde914e1616c8
+LINUX_VERSION-5.10 = .138
+LINUX_KERNEL_HASH-5.10.138 = 29a003bb8e0e3a45942f703370fb0b3460e6fdcbbad37424423c9cf831ab5ba8

include/kernel-5.15

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .62
-LINUX_KERNEL_HASH-5.15.62 = 06817cde8e57cdb6dbf20eaa5122fee110024f6e8b783799c98cb65dc753f141
+LINUX_VERSION-5.15 = .63
+LINUX_KERNEL_HASH-5.15.63 = 6dd3cd1e5a629d0002bc6c6ec7e8ea96710104f38664122dd56c83dfd4eb7341

target/linux/generic/backport-5.10/610-v5.13-10-netfilter-nftables-update-table-flags-from-the-commi.patch

@@ -34,7 +34,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  	struct nft_set			*set;
 --- a/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c
-@@ -893,6 +893,12 @@ static void nf_tables_table_disable(stru
+@@ -917,6 +917,12 @@ static void nf_tables_table_disable(stru
  	nft_table_disable(net, table, 0);
  }
 
@@ -47,7 +47,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  static int nf_tables_updtable(struct nft_ctx *ctx)
  {
  	struct nft_trans *trans;
-@@ -916,19 +922,17 @@ static int nf_tables_updtable(struct nft
+@@ -940,19 +946,17 @@ static int nf_tables_updtable(struct nft
 
  	if ((flags & NFT_TABLE_F_DORMANT) &&
  	    !(ctx->table->flags & NFT_TABLE_F_DORMANT)) {
@@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  	nft_trans_table_update(trans) = true;
  	list_add_tail(&trans->list, &ctx->net->nft.commit_list);
  	return 0;
-@@ -7931,11 +7935,10 @@ static int nf_tables_commit(struct net *
+@@ -7929,11 +7933,10 @@ static int nf_tables_commit(struct net *
  		switch (trans->msg_type) {
  		case NFT_MSG_NEWTABLE:
  			if (nft_trans_table_update(trans)) {
@@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  			} else {
  				nft_clear(net, trans->ctx.table);
  			}
-@@ -8148,11 +8151,9 @@ static int __nf_tables_abort(struct net
+@@ -8147,11 +8150,9 @@ static int __nf_tables_abort(struct net
  		switch (trans->msg_type) {
  		case NFT_MSG_NEWTABLE:
  			if (nft_trans_table_update(trans)) {

target/linux/generic/hack-5.10/321-powerpc_crtsavres_prereq.patch

@@ -16,7 +16,7 @@ Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
 
 --- a/arch/powerpc/Makefile
 +++ b/arch/powerpc/Makefile
-@@ -61,19 +61,6 @@ machine-$(CONFIG_PPC64) += 64
+@@ -44,19 +44,6 @@ machine-$(CONFIG_PPC64) += 64
  machine-$(CONFIG_CPU_LITTLE_ENDIAN) += le
  UTS_MACHINE := $(subst $(space),,$(machine-y))
 

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

@@ -274,7 +274,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  int nf_ct_expect_register_notifier(struct net *net,
 --- a/net/netfilter/nf_conntrack_netlink.c
 +++ b/net/netfilter/nf_conntrack_netlink.c
-@@ -706,13 +706,20 @@ static size_t ctnetlink_nlmsg_size(const
+@@ -701,12 +701,19 @@ static size_t ctnetlink_nlmsg_size(const
  }
 
  static int
@@ -287,15 +287,14 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  	const struct nf_conntrack_zone *zone;
  	struct net *net;
  	struct nlmsghdr *nlh;
- 	struct nfgenmsg *nfmsg;
  	struct nlattr *nest_parms;
 +#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS
 +	struct nf_ct_event *item = (struct nf_ct_event *)ptr;
 +#endif
  	struct nf_conn *ct = item->ct;
  	struct sk_buff *skb;
  	unsigned int type;
-@@ -3787,9 +3794,15 @@ static int ctnetlink_stat_exp_cpu(struct
+@@ -3752,9 +3759,15 @@ static int ctnetlink_stat_exp_cpu(struct
  }
 
  #ifdef CONFIG_NF_CONNTRACK_EVENTS

target/linux/generic/hack-5.15/321-powerpc_crtsavres_prereq.patch

@@ -16,7 +16,7 @@ Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
 
 --- a/arch/powerpc/Makefile
 +++ b/arch/powerpc/Makefile
-@@ -61,19 +61,6 @@ machine-$(CONFIG_PPC64) += 64
+@@ -44,19 +44,6 @@ machine-$(CONFIG_PPC64) += 64
  machine-$(CONFIG_CPU_LITTLE_ENDIAN) += le
  UTS_MACHINE := $(subst $(space),,$(machine-y))
 

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

@@ -22,7 +22,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
 
 --- a/include/net/netfilter/nf_conntrack_ecache.h
 +++ b/include/net/netfilter/nf_conntrack_ecache.h
-@@ -65,9 +65,14 @@ struct nf_ct_event_notifier {
+@@ -65,9 +65,14 @@
  	int (*exp_event)(unsigned int events, const struct nf_exp_event *item);
  };
 
@@ -38,7 +38,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
 
  void nf_ct_deliver_cached_events(struct nf_conn *ct);
  int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct,
-@@ -98,11 +103,13 @@ static inline void
+@@ -98,11 +103,13 @@
  nf_conntrack_event_cache(enum ip_conntrack_events event, struct nf_conn *ct)
  {
  #ifdef CONFIG_NF_CONNTRACK_EVENTS
@@ -53,14 +53,21 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
 
  	e = nf_ct_ecache_find(ct);
  	if (e == NULL)
-@@ -117,20 +124,24 @@ nf_conntrack_event_report(enum ip_conntr
+@@ -117,20 +124,34 @@
  			  u32 portid, int report)
  {
  #ifdef CONFIG_NF_CONNTRACK_EVENTS
+-	if (nf_ct_ecache_exist(ct))
+-		return nf_conntrack_eventmask_report(1 << event, ct, portid, report);
 +#ifndef CONFIG_NF_CONNTRACK_CHAIN_EVENTS
- 	if (nf_ct_ecache_exist(ct))
- 		return nf_conntrack_eventmask_report(1 << event, ct, portid, report);
++	const struct net *net = nf_ct_net(ct);
++
++	if (!rcu_access_pointer(net->ct.nf_conntrack_event_cb))
++		return 0;
  #endif
++
++	return nf_conntrack_eventmask_report(1 << event, ct, portid, report);
++#else
  	return 0;
 +#endif
  }
@@ -69,20 +76,27 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  nf_conntrack_event(enum ip_conntrack_events event, struct nf_conn *ct)
  {
  #ifdef CONFIG_NF_CONNTRACK_EVENTS
+-	if (nf_ct_ecache_exist(ct))
+-		return nf_conntrack_eventmask_report(1 << event, ct, 0, 0);
 +#ifndef CONFIG_NF_CONNTRACK_CHAIN_EVENTS
- 	if (nf_ct_ecache_exist(ct))
- 		return nf_conntrack_eventmask_report(1 << event, ct, 0, 0);
++	const struct net *net = nf_ct_net(ct);
++
++	if (!rcu_access_pointer(net->ct.nf_conntrack_event_cb))
++		return 0;
  #endif
++
++	return nf_conntrack_eventmask_report(1 << event, ct, 0, 0);
++#else
  	return 0;
 +#endif
  }
 
  #ifdef CONFIG_NF_CONNTRACK_EVENTS
 --- a/include/net/netns/conntrack.h
 +++ b/include/net/netns/conntrack.h
-@@ -107,6 +107,9 @@ struct netns_ct {
- 	u8			sysctl_checksum;
+@@ -113,6 +113,9 @@ struct netns_ct {
 
+ 	struct ct_pcpu __percpu *pcpu_lists;
  	struct ip_conntrack_stat __percpu *stat;
 +#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS
 +	struct atomic_notifier_head nf_conntrack_chain;
@@ -92,7 +106,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  #if defined(CONFIG_NF_CONNTRACK_LABELS)
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -162,6 +162,14 @@ config NF_CONNTRACK_EVENTS
+@@ -151,6 +151,14 @@ config NF_CONNTRACK_EVENTS
 
  	  If unsure, say `N'.
 
@@ -109,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
-@@ -2802,6 +2802,10 @@ int nf_conntrack_init_net(struct net *ne
+@@ -2878,6 +2878,10 @@ int nf_conntrack_init_net(struct net *ne
  	nf_conntrack_helper_pernet_init(net);
  	nf_conntrack_proto_pernet_init(net);
 
@@ -122,17 +136,17 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  err_expect:
 --- a/net/netfilter/nf_conntrack_ecache.c
 +++ b/net/netfilter/nf_conntrack_ecache.c
-@@ -17,6 +17,9 @@
- #include <linux/stddef.h>
+@@ -18,6 +18,9 @@
  #include <linux/err.h>
+ #include <linux/percpu.h>
  #include <linux/kernel.h>
 +#ifdef CONFIG_NF_CONNTRACK_CHAIN_EVENTS
 +#include <linux/notifier.h>
 +#endif
  #include <linux/netdevice.h>
  #include <linux/slab.h>
  #include <linux/export.h>
-@@ -162,6 +165,35 @@ static int __nf_conntrack_eventmask_repo
+@@ -167,6 +170,35 @@ static int __nf_conntrack_eventmask_repo
  	return ret;
  }
 
@@ -168,7 +182,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  int nf_conntrack_eventmask_report(unsigned int events, struct nf_conn *ct,
  				  u32 portid, int report)
  {
-@@ -197,10 +229,52 @@ int nf_conntrack_eventmask_report(unsign
+@@ -203,10 +235,52 @@ int nf_conntrack_eventmask_report(unsign
 
  	return ret;
  }
@@ -221,15 +235,15 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  void nf_ct_deliver_cached_events(struct nf_conn *ct)
  {
  	struct nf_conntrack_ecache *e;
-@@ -226,6 +300,7 @@ void nf_ct_deliver_cached_events(struct
+@@ -232,6 +306,7 @@ void nf_ct_deliver_cached_events(struct
  	 */
  	__nf_conntrack_eventmask_report(e, events, e->missed, &item);
  }
 +#endif
  EXPORT_SYMBOL_GPL(nf_ct_deliver_cached_events);
 
  void nf_ct_expect_event_report(enum ip_conntrack_expect_events event,
-@@ -258,20 +333,43 @@ out_unlock:
+@@ -264,20 +339,43 @@ out_unlock:
  	rcu_read_unlock();
  }
 
@@ -275,7 +289,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  void nf_conntrack_unregister_notifier(struct net *net)
  {
  	mutex_lock(&nf_ct_ecache_mutex);
-@@ -279,6 +377,7 @@ void nf_conntrack_unregister_notifier(st
+@@ -285,6 +383,7 @@ void nf_conntrack_unregister_notifier(st
  	mutex_unlock(&nf_ct_ecache_mutex);
  	/* synchronize_rcu() is called after netns pre_exit */
  }
@@ -285,7 +299,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  void nf_conntrack_ecache_work(struct net *net, enum nf_ct_ecache_state state)
 --- a/net/netfilter/nf_conntrack_netlink.c
 +++ b/net/netfilter/nf_conntrack_netlink.c
-@@ -712,12 +712,19 @@ static size_t ctnetlink_nlmsg_size(const
+@@ -706,12 +706,19 @@ static size_t ctnetlink_nlmsg_size(const
  }
 
  static int
@@ -305,7 +319,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
  	struct nf_conn *ct = item->ct;
  	struct sk_buff *skb;
  	unsigned int type;
-@@ -3791,11 +3798,17 @@ static int ctnetlink_stat_exp_cpu(struct
+@@ -3761,11 +3768,17 @@ static int ctnetlink_stat_exp_cpu(struct
  }
 
  #ifdef CONFIG_NF_CONNTRACK_EVENTS
@@ -323,7 +337,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
 
  static const struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = {
  	[IPCTNL_MSG_CT_NEW]	= {
-@@ -3894,8 +3907,12 @@ static int __net_init ctnetlink_net_init
+@@ -3864,8 +3877,12 @@ static int __net_init ctnetlink_net_init
  static void ctnetlink_net_pre_exit(struct net *net)
  {
  #ifdef CONFIG_NF_CONNTRACK_EVENTS

target/linux/generic/pending-5.15/703-phy-add-detach-callback-to-struct-phy_driver.patch

@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -1738,6 +1738,9 @@ void phy_detach(struct phy_device *phyde
+@@ -1744,6 +1744,9 @@ void phy_detach(struct phy_device *phyde
  	struct module *ndev_owner = NULL;
  	struct mii_bus *bus;
 

target/linux/generic/pending-5.15/850-0023-PCI-aardvark-Make-main-irq_chip-structure-a-static-d.patch

@@ -33,15 +33,15 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -274,7 +274,6 @@ struct advk_pcie {
+@@ -275,7 +275,6 @@ struct advk_pcie {
  	u8 wins_count;
  	struct irq_domain *rp_irq_domain;
  	struct irq_domain *irq_domain;
 -	struct irq_chip irq_chip;
  	raw_spinlock_t irq_lock;
  	struct irq_domain *msi_domain;
  	struct irq_domain *msi_inner_domain;
-@@ -1330,14 +1329,19 @@ static void advk_pcie_irq_unmask(struct
+@@ -1345,14 +1344,19 @@ static void advk_pcie_irq_unmask(struct
  	raw_spin_unlock_irqrestore(&pcie->irq_lock, flags);
  }
 
@@ -63,15 +63,15 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
  	irq_set_chip_data(virq, pcie);
 
  	return 0;
-@@ -1396,7 +1400,6 @@ static int advk_pcie_init_irq_domain(str
+@@ -1411,7 +1415,6 @@ static int advk_pcie_init_irq_domain(str
  	struct device *dev = &pcie->pdev->dev;
  	struct device_node *node = dev->of_node;
  	struct device_node *pcie_intc_node;
 -	struct irq_chip *irq_chip;
  	int ret = 0;
 
  	raw_spin_lock_init(&pcie->irq_lock);
-@@ -1407,28 +1410,14 @@ static int advk_pcie_init_irq_domain(str
+@@ -1422,28 +1425,14 @@ static int advk_pcie_init_irq_domain(str
  		return -ENODEV;
  	}
 

target/linux/generic/pending-5.15/851-0006-Revert-PCI-aardvark-Fix-initialization-with-old-Marv.patch

@@ -23,7 +23,7 @@ Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1632,9 +1632,7 @@ static int advk_pcie_enable_phy(struct a
+@@ -1631,9 +1631,7 @@ static int advk_pcie_enable_phy(struct a
  	}
 
  	ret = phy_power_on(pcie->phy);

target/linux/ipq807x/patches-5.10/109-clk-qcom-Add-WCSSAON-reset.patch

@@ -15,7 +15,7 @@ Acked-by: Stephen Boyd <sboyd@kernel.org>
 
 --- a/drivers/clk/qcom/gcc-ipq8074.c
 +++ b/drivers/clk/qcom/gcc-ipq8074.c
-@@ -4789,6 +4789,7 @@ static const struct qcom_reset_map gcc_i
+@@ -4790,6 +4790,7 @@ static const struct qcom_reset_map gcc_i
  	[GCC_PCIE1_AXI_SLAVE_ARES] = { 0x76040, 4 },
  	[GCC_PCIE1_AHB_ARES] = { 0x76040, 5 },
  	[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },

target/linux/ipq807x/patches-5.10/125-ipq8074-gcc-Added-support-for-NSS-clocks.patch

@@ -34,7 +34,7 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
  };
 --- a/drivers/clk/qcom/gcc-ipq8074.c
 +++ b/drivers/clk/qcom/gcc-ipq8074.c
-@@ -3182,6 +3182,24 @@ static struct clk_branch gcc_nss_ptp_ref
+@@ -3183,6 +3183,24 @@ static struct clk_branch gcc_nss_ptp_ref
  	},
  };
 
@@ -59,7 +59,7 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
  static struct clk_branch gcc_nssnoc_ce_apb_clk = {
  	.halt_reg = 0x6830c,
  	.clkr = {
-@@ -4607,6 +4625,7 @@ static struct clk_regmap *gcc_ipq8074_cl
+@@ -4608,6 +4626,7 @@ static struct clk_regmap *gcc_ipq8074_cl
  	[GCC_CMN_12GPLL_AHB_CLK] = &gcc_cmn_12gpll_ahb_clk.clkr,
  	[GCC_CMN_12GPLL_SYS_CLK] = &gcc_cmn_12gpll_sys_clk.clkr,
  	[GCC_MDIO_AHB_CLK] = &gcc_mdio_ahb_clk.clkr,