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

* https://github.com/coolsnowwolf/lede:
  rockchip: fix kernel 6.1 patch for dfi
  rockchip: add more opp-microvol for new(?) type NanoPi R2S
  kernel: bump 5.4 to 5.4.263 (coolsnowwolf#11695)
  kernel: bump 6.1 to 6.1.66 (coolsnowwolf#11694)

include/kernel-5.4

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.4 = .260
-LINUX_KERNEL_HASH-5.4.260 = 9830820714c8f5985c50071cc9e1b40533ee81a4f6c704916c7148d16e54ebfe
+LINUX_VERSION-5.4 = .263
+LINUX_KERNEL_HASH-5.4.263 = 50d0db9a94118b2d45f2ea1ed7b094cfd39f32829e4a2b51473dd3a8257735f8

include/kernel-6.1

@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .62
-LINUX_KERNEL_HASH-6.1.62 = b9fd616facd6becfceef88b9be718d0f16625cab3fe81d11384802a7091e85ec
+LINUX_VERSION-6.1 = .66
+LINUX_KERNEL_HASH-6.1.66 = 419e62cd6c4239e6950b688db9e8753eb1e99c216dc3204f7932398a3fef1a0c

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

@@ -1000,7 +1000,7 @@ Signed-off-by: David S. Miller <[email protected]>
  		u32 mahr = ravb_read(ndev, MAHR);
  		u32 malr = ravb_read(ndev, MALR);
 
-@@ -2154,7 +2156,7 @@ static int ravb_probe(struct platform_de
+@@ -2165,7 +2167,7 @@ static int ravb_probe(struct platform_de
  	priv->msg_enable = RAVB_DEF_MSG_ENABLE;
 
  	/* Read and set MAC address */
@@ -1302,7 +1302,7 @@ Signed-off-by: David S. Miller <[email protected]>
  	int irq;
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -4477,7 +4477,7 @@ int stmmac_dvr_probe(struct device *devi
+@@ -4519,7 +4519,7 @@ int stmmac_dvr_probe(struct device *devi
  	priv->wol_irq = res->wol_irq;
  	priv->lpi_irq = res->lpi_irq;
 

target/linux/generic/backport-6.1/020-v6.3-06-BACKPORT-mm-multi-gen-LRU-per-node-lru_gen_folio-lis.patch

@@ -325,7 +325,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
  	mctz = soft_limit_tree.rb_tree_per_node[nid];
  	if (!mctz)
  		return;
-@@ -3523,6 +3533,9 @@ unsigned long mem_cgroup_soft_limit_recl
+@@ -3524,6 +3534,9 @@ unsigned long mem_cgroup_soft_limit_recl
  	struct mem_cgroup_tree_per_node *mctz;
  	unsigned long excess;
 
@@ -335,23 +335,23 @@ Signed-off-by: T.J. Mercier <[email protected]>
  	if (order > 0)
  		return 0;
 
-@@ -5386,6 +5399,7 @@ static int mem_cgroup_css_online(struct
+@@ -5387,6 +5400,7 @@ static int mem_cgroup_css_online(struct
  	if (unlikely(mem_cgroup_is_root(memcg)))
  		queue_delayed_work(system_unbound_wq, &stats_flush_dwork,
  				   2UL*HZ);
 +	lru_gen_online_memcg(memcg);
  	return 0;
  offline_kmem:
  	memcg_offline_kmem(memcg);
-@@ -5417,6 +5431,7 @@ static void mem_cgroup_css_offline(struc
+@@ -5418,6 +5432,7 @@ static void mem_cgroup_css_offline(struc
  	memcg_offline_kmem(memcg);
  	reparent_shrinker_deferred(memcg);
  	wb_memcg_offline(memcg);
 +	lru_gen_offline_memcg(memcg);
 
  	drain_all_stock(memcg);
 
-@@ -5428,6 +5443,7 @@ static void mem_cgroup_css_released(stru
+@@ -5429,6 +5444,7 @@ static void mem_cgroup_css_released(stru
  	struct mem_cgroup *memcg = mem_cgroup_from_css(css);
 
  	invalidate_reclaim_iterators(memcg);

target/linux/generic/hack-5.4/259-regmap_dynamic.patch

@@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  #include <linux/mutex.h>
  #include <linux/err.h>
  #include <linux/of.h>
-@@ -3120,3 +3121,5 @@ static int __init regmap_initcall(void)
+@@ -3122,3 +3123,5 @@ static int __init regmap_initcall(void)
  	return 0;
  }
  postcore_initcall(regmap_initcall);

target/linux/generic/hack-5.4/995-usb-serial-option-add-ec200a.patch

@@ -8,7 +8,7 @@
  #define QUECTEL_PRODUCT_RM500K			0x7001
 
  #define CMOTECH_VENDOR_ID			0x16d8
-@@ -1242,6 +1243,7 @@ static const struct usb_device_id option
+@@ -1244,6 +1245,7 @@ static const struct usb_device_id option
  	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200U, 0xff, 0, 0) },
  	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) },
  	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) },

target/linux/generic/hack-6.1/259-regmap_dynamic.patch

@@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  #include <linux/mutex.h>
  #include <linux/err.h>
  #include <linux/property.h>
-@@ -3511,3 +3512,5 @@ static int __init regmap_initcall(void)
+@@ -3513,3 +3514,5 @@ static int __init regmap_initcall(void)
  	return 0;
  }
  postcore_initcall(regmap_initcall);

target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch

@@ -43,7 +43,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
 
  #define QUECTEL_VENDOR_ID			0x2c7c
  /* These Quectel products use Quectel's vendor ID */
-@@ -1144,6 +1149,11 @@ static const struct usb_device_id option
+@@ -1147,6 +1152,11 @@ static const struct usb_device_id option
  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */
  	  .driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) },
@@ -55,7 +55,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
  	/* Quectel products using Qualcomm vendor ID */
  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
-@@ -1185,6 +1195,11 @@ static const struct usb_device_id option
+@@ -1188,6 +1198,11 @@ static const struct usb_device_id option
  	  .driver_info = ZLP },
  	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
  	  .driver_info = RSVD(4) },

target/linux/generic/hack-6.1/904-debloat_dma_buf.patch

@@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 +MODULE_LICENSE("GPL");
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -4363,6 +4363,7 @@ int wake_up_state(struct task_struct *p,
+@@ -4367,6 +4367,7 @@ int wake_up_state(struct task_struct *p,
  {
  	return try_to_wake_up(p, state, 0);
  }

target/linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch

@@ -110,15 +110,15 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
 
 --- a/include/uapi/linux/netfilter/nf_tables.h
 +++ b/include/uapi/linux/netfilter/nf_tables.h
-@@ -1516,6 +1516,7 @@ enum nft_object_attributes {
+@@ -1517,6 +1517,7 @@ enum nft_object_attributes {
   * @NFTA_FLOWTABLE_HOOK: netfilter hook configuration(NLA_U32)
   * @NFTA_FLOWTABLE_USE: number of references to this flow table (NLA_U32)
   * @NFTA_FLOWTABLE_HANDLE: object handle (NLA_U64)
 + * @NFTA_FLOWTABLE_FLAGS: flags (NLA_U32)
   */
  enum nft_flowtable_attributes {
  	NFTA_FLOWTABLE_UNSPEC,
-@@ -1525,6 +1526,7 @@ enum nft_flowtable_attributes {
+@@ -1526,6 +1527,7 @@ enum nft_flowtable_attributes {
  	NFTA_FLOWTABLE_USE,
  	NFTA_FLOWTABLE_HANDLE,
  	NFTA_FLOWTABLE_PAD,
@@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
 +MODULE_ALIAS("nf-flow-table-hw");
 --- a/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c
-@@ -5889,6 +5889,13 @@ static int nf_tables_flowtable_parse_hoo
+@@ -5974,6 +5974,13 @@ static int nf_tables_flowtable_parse_hoo
  	if (err < 0)
  		return err;
 
@@ -520,7 +520,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
  	ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL);
  	if (!ops)
  		return -ENOMEM;
-@@ -6024,10 +6031,19 @@ static int nf_tables_newflowtable(struct
+@@ -6118,10 +6125,19 @@ static int nf_tables_newflowtable(struct
  	}
 
  	flowtable->data.type = type;
@@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
  	err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK],
  					     flowtable);
  	if (err < 0)
-@@ -6150,7 +6166,8 @@ static int nf_tables_fill_flowtable_info
+@@ -6247,7 +6263,8 @@ static int nf_tables_fill_flowtable_info
  	    nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) ||
  	    nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) ||
  	    nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle),

target/linux/generic/pending-6.1/901-usb-add-more-modem-support.patch

@@ -12,7 +12,7 @@
  	{QMI_GOBI1K_DEVICE(0x05c6, 0x9212)},	/* Acer Gobi Modem Device */
 --- a/drivers/usb/serial/option.c
 +++ b/drivers/usb/serial/option.c
-@@ -2262,6 +2262,12 @@ static const struct usb_device_id option
+@@ -2266,6 +2266,12 @@ static const struct usb_device_id option
  	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a2, 0xff) },			/* Fibocom FM101-GL (laptop MBIM) */
  	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a4, 0xff),			/* Fibocom FM101-GL (laptop MBIM) */
  	  .driver_info = RSVD(4) },

target/linux/generic/pending-6.1/920-mangle_bootargs.patch

@@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <[email protected]>
  	help
 --- a/init/main.c
 +++ b/init/main.c
-@@ -607,6 +607,29 @@ static inline void setup_nr_cpu_ids(void
+@@ -611,6 +611,29 @@ static inline void setup_nr_cpu_ids(void
  static inline void smp_prepare_cpus(unsigned int maxcpus) { }
  #endif
 
@@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <[email protected]>
  /*
   * We need to store the untouched command line for future reference.
   * We also need to store the touched command line since the parameter
-@@ -954,6 +977,7 @@ asmlinkage __visible void __init __no_sa
+@@ -958,6 +981,7 @@ asmlinkage __visible void __init __no_sa
  	pr_notice("%s", linux_banner);
  	early_security_init();
  	setup_arch(&command_line);

target/linux/generic/pending-6.1/994-add-quectel-rm500u-support.patch

@@ -8,7 +8,7 @@
  #define QUECTEL_PRODUCT_EC200U			0x0901
  #define QUECTEL_PRODUCT_EC200S_CN		0x6002
  #define QUECTEL_PRODUCT_EC200A			0x6005
-@@ -1243,6 +1244,7 @@ static const struct usb_device_id option
+@@ -1245,6 +1246,7 @@ static const struct usb_device_id option
  	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) },
  	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) },
  	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500K, 0xff, 0x00, 0x00) },

target/linux/ipq806x/patches-5.4/850-soc-add-qualcomm-syscon.patch

@@ -8,11 +8,11 @@ Subject: SoC: add qualcomm syscon
  obj-$(CONFIG_QCOM_WCNSS_CTRL) += wcnss_ctrl.o
 +obj-$(CONFIG_QCOM_TCSR)	 += qcom_tcsr.o
  obj-$(CONFIG_QCOM_APR) += apr.o
- obj-$(CONFIG_QCOM_LLCC) += llcc-slice.o
- obj-$(CONFIG_QCOM_SDM845_LLCC) += llcc-sdm845.o
+ obj-$(CONFIG_QCOM_LLCC) += llcc-qcom.o
+ obj-$(CONFIG_QCOM_RPMHPD) += rpmhpd.o
 --- a/drivers/soc/qcom/Kconfig
 +++ b/drivers/soc/qcom/Kconfig
-@@ -184,6 +184,13 @@ config QCOM_SOCINFO
+@@ -176,6 +176,13 @@ config QCOM_SOCINFO
  	 Say yes here to support the Qualcomm socinfo driver, providing
  	 information about the SoC to user space.
 

target/linux/ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch

@@ -514,15 +514,15 @@
  			if (bond_is_lb(bond))
  				bond_alb_handle_link_change(bond, new_active, BOND_LINK_UP);
  		} else {
-@@ -1412,6 +1430,7 @@ int bond_enslave(struct net_device *bond
+@@ -1418,6 +1436,7 @@ int bond_enslave(struct net_device *bond
  	const struct net_device_ops *slave_ops = slave_dev->netdev_ops;
  	struct slave *new_slave = NULL, *prev_slave;
  	struct sockaddr_storage ss;
 +	struct bond_cb *lag_cb_main; /* QCA NSS ECM support */
  	int link_reporting;
  	int res = 0, i;
 
-@@ -1811,6 +1830,13 @@ int bond_enslave(struct net_device *bond
+@@ -1817,6 +1836,13 @@ int bond_enslave(struct net_device *bond
  	if (bond_mode_can_use_xmit_hash(bond))
  		bond_update_slave_arr(bond, NULL);
 
@@ -536,7 +536,7 @@
 
  	slave_info(bond_dev, slave_dev, "Enslaving as %s interface with %s link\n",
  		   bond_is_active_slave(new_slave) ? "an active" : "a backup",
-@@ -1883,6 +1909,14 @@ err_undo_flags:
+@@ -1889,6 +1915,14 @@ err_undo_flags:
  		}
  	}
 
@@ -551,15 +551,15 @@
  	return res;
  }
 
-@@ -1904,6 +1938,7 @@ static int __bond_release_one(struct net
+@@ -1910,6 +1944,7 @@ static int __bond_release_one(struct net
  	struct bonding *bond = netdev_priv(bond_dev);
  	struct slave *slave, *oldcurrent;
  	struct sockaddr_storage ss;
 +	struct bond_cb *lag_cb_main; /* QCA NSS ECM support */
  	int old_flags = bond_dev->flags;
  	netdev_features_t old_features = bond_dev->features;
 
-@@ -1926,6 +1961,14 @@ static int __bond_release_one(struct net
+@@ -1932,6 +1967,14 @@ static int __bond_release_one(struct net
 
  	bond_set_slave_inactive_flags(slave, BOND_SLAVE_NOTIFY_NOW);
 
@@ -574,7 +574,7 @@
  	bond_sysfs_slave_del(slave);
 
  	/* recompute stats just before removing the slave */
-@@ -2231,6 +2274,10 @@ static void bond_miimon_commit(struct bo
+@@ -2237,6 +2280,10 @@ static void bond_miimon_commit(struct bo
  {
  	struct list_head *iter;
  	struct slave *slave, *primary;
@@ -585,7 +585,7 @@
 
  	bond_for_each_slave(bond, slave, iter) {
  		switch (slave->link_new_state) {
-@@ -2274,6 +2321,12 @@ static void bond_miimon_commit(struct bo
+@@ -2280,6 +2327,12 @@ static void bond_miimon_commit(struct bo
 
  			bond_miimon_link_change(bond, slave, BOND_LINK_UP);
 
@@ -598,7 +598,7 @@
  			if (!bond->curr_active_slave || slave == primary)
  				goto do_failover;
 
-@@ -2315,6 +2368,15 @@ do_failover:
+@@ -2321,6 +2374,15 @@ do_failover:
  	}
 
  	bond_set_carrier(bond);
@@ -614,7 +614,7 @@
  }
 
  /* bond_mii_monitor
-@@ -4408,6 +4470,11 @@ static void bond_destructor(struct net_d
+@@ -4414,6 +4476,11 @@ static void bond_destructor(struct net_d
  	struct bonding *bond = netdev_priv(bond_dev);
  	if (bond->wq)
  		destroy_workqueue(bond->wq);
@@ -626,7 +626,7 @@
  }
 
  void bond_setup(struct net_device *bond_dev)
-@@ -4961,6 +5028,16 @@ int bond_create(struct net *net, const c
+@@ -4967,6 +5034,16 @@ int bond_create(struct net *net, const c
  	bond_work_init_all(bond);
 
  	rtnl_unlock();
@@ -643,7 +643,7 @@
  	return 0;
  }
 
-@@ -5056,6 +5133,203 @@ static void __exit bonding_exit(void)
+@@ -5062,6 +5139,203 @@ static void __exit bonding_exit(void)
  #endif
  }
 

target/linux/ipq95xx/patches-6.1/0001-soc-qcom-smd-rpm-Add-IPQ9574-compatible.patch

@@ -15,18 +15,13 @@ Link: https://lore.kernel.org/r/[email protected]
  drivers/soc/qcom/smd-rpm.c | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/soc/qcom/smd-rpm.c b/drivers/soc/qcom/smd-rpm.c
-index 413f9f4ae9cd..10765775ee17 100644
 --- a/drivers/soc/qcom/smd-rpm.c
 +++ b/drivers/soc/qcom/smd-rpm.c
-@@ -233,6 +233,7 @@ static void qcom_smd_rpm_remove(struct rpmsg_device *rpdev)
+@@ -233,6 +233,7 @@ static void qcom_smd_rpm_remove(struct r
  static const struct of_device_id qcom_smd_rpm_of_match[] = {
  	{ .compatible = "qcom,rpm-apq8084" },
  	{ .compatible = "qcom,rpm-ipq6018" },
 +	{ .compatible = "qcom,rpm-ipq9574" },
  	{ .compatible = "qcom,rpm-msm8226" },
  	{ .compatible = "qcom,rpm-msm8909" },
  	{ .compatible = "qcom,rpm-msm8916" },
--- 
-2.34.1
-

target/linux/ipq95xx/patches-6.1/0002-clk-qcom-apss-ipq-pll-refactor-the-driver-to-accommo.patch

@@ -17,8 +17,6 @@ Link: https://lore.kernel.org/r/[email protected]
  drivers/clk/qcom/apss-ipq-pll.c | 60 ++++++++++++++++++++++-----------
  1 file changed, 41 insertions(+), 19 deletions(-)
 
-diff --git a/drivers/clk/qcom/apss-ipq-pll.c b/drivers/clk/qcom/apss-ipq-pll.c
-index a5aea27eb867..4f2a147e9fb2 100644
 --- a/drivers/clk/qcom/apss-ipq-pll.c
 +++ b/drivers/clk/qcom/apss-ipq-pll.c
 @@ -8,20 +8,27 @@
@@ -60,7 +58,7 @@ index a5aea27eb867..4f2a147e9fb2 100644
  	.flags = SUPPORTS_DYNAMIC_UPDATE,
  	.clkr = {
  		.enable_reg = 0x0,
-@@ -61,6 +68,21 @@ static const struct alpha_pll_config ipq8074_pll_config = {
+@@ -61,6 +68,21 @@ static const struct alpha_pll_config ipq
  	.test_ctl_hi_val = 0x4000,
  };
 
@@ -82,7 +80,7 @@ index a5aea27eb867..4f2a147e9fb2 100644
  static const struct regmap_config ipq_pll_regmap_config = {
  	.reg_bits		= 32,
  	.reg_stride		= 4,
-@@ -71,7 +93,7 @@ static const struct regmap_config ipq_pll_regmap_config = {
+@@ -71,7 +93,7 @@ static const struct regmap_config ipq_pl
 
  static int apss_ipq_pll_probe(struct platform_device *pdev)
  {
@@ -91,7 +89,7 @@ index a5aea27eb867..4f2a147e9fb2 100644
  	struct device *dev = &pdev->dev;
  	struct regmap *regmap;
  	void __iomem *base;
-@@ -85,23 +107,23 @@ static int apss_ipq_pll_probe(struct platform_device *pdev)
+@@ -85,23 +107,23 @@ static int apss_ipq_pll_probe(struct pla
  	if (IS_ERR(regmap))
  		return PTR_ERR(regmap);
 
@@ -122,6 +120,3 @@ index a5aea27eb867..4f2a147e9fb2 100644
  	{ }
  };
  MODULE_DEVICE_TABLE(of, apss_ipq_pll_match_table);
--- 
-2.34.1
-