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

* https://github.com/coolsnowwolf/lede:
  mac80211: fix ath10k 5.19 support
  rockchip: add sdhi pinctrl for nanopi5
  ipq807x: fixes build error and refresh 5.10 patches (coolsnowwolf#9991)
  kernel: bump 5.10 to 5.10.137 (coolsnowwolf#9990)
  elfutils: update to 0.187
  tools: elfutils: Update to version 0.187
  tools/elfutils: drop HOST_BUILD_DEPENDS
  tools/elfutils: only build required components
  tools/elfutils: depend on m4
  tools/dwarves: add host package
  elfutils: move host build to tools
  tools: build bash on macOS and use it for ipkg-build
  elfutils: fix host compilation with Alpine Linux
  argp-standalone: add host-compile ability
  tools/cmake: update to 3.24.1
  tools/cmake: update to 3.22.3
  tools/isl: update to 0.25
  tools/xz: update to 5.2.6

include/kernel-5.10

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .136
-LINUX_KERNEL_HASH-5.10.136 = 1c099d0d59e7d9f671dfc947e16891b7a3a45efd7dfcc6b1e55a194961e45159
+LINUX_VERSION-5.10 = .137
+LINUX_KERNEL_HASH-5.10.137 = c16bcd4d1453d7e645007d0a25270f52401331c7df81c364f57bde914e1616c8

include/package-ipkg.mk

@@ -263,7 +263,7 @@ $(_endef)
     endif
 
 	$(INSTALL_DIR) $$(PDIR_$(1))
-	$(FAKEROOT) $(SCRIPT_DIR)/ipkg-build -m "$(FILE_MODES)" $$(IDIR_$(1)) $$(PDIR_$(1))
+	$(FAKEROOT) $(STAGING_DIR_HOST)/bin/bash $(SCRIPT_DIR)/ipkg-build -m "$(FILE_MODES)" $$(IDIR_$(1)) $$(PDIR_$(1))
 	@[ -f $$(IPKG_$(1)) ]
 
     $(1)-clean:

package/kernel/mac80211/patches/ath10k/991-ath10k-5.19.patch

@@ -0,0 +1,14 @@
+--- a/drivers/net/wireless/ath/ath10k/core.c
++++ b/drivers/net/wireless/ath/ath10k/core.c
+@@ -3333,7 +3333,11 @@
+ 		ath10k_debug_print_board_info(ar);
+ 	}
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)
+ 	device_get_mac_address(ar->dev, ar->mac_addr, sizeof(ar->mac_addr));
++#else
++	device_get_mac_address(ar->dev, ar->mac_addr);
++#endif
+
+ 	of_get_mac_address(ar->dev->of_node, ar->mac_addr);
+

package/libs/argp-standalone/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=argp-standalone
 PKG_VERSION:=1.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.lysator.liu.se/~nisse/misc/
@@ -20,6 +20,7 @@ PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE:=Makefile.am
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
 
 define Package/argp-standalone
   SECTION:=libs
@@ -45,4 +46,14 @@ define Build/InstallDev
 		$(1)/usr/lib/
 endef
 
+define Host/Install
+	$(INSTALL_DIR) $(1)/include
+	$(CP)   $(HOST_BUILD_DIR)/argp.h \
+		$(1)/include/
+	$(INSTALL_DIR) $(1)/lib
+	$(CP)   $(HOST_BUILD_DIR)/libargp.a \
+		$(1)/lib/
+endef
+
 $(eval $(call BuildPackage,argp-standalone))
+$(eval $(call HostBuild))

package/libs/elfutils/Makefile

@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=elfutils
-PKG_VERSION:=0.186
+PKG_VERSION:=0.187
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://sourceware.org/$(PKG_NAME)/ftp/$(PKG_VERSION)
-PKG_HASH:=7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177
+PKG_HASH:=e70b0dfbe610f90c4d1fe0d71af142a4e25c3c4ef9ebab8d2d72b65159d454c8
 
 PKG_MAINTAINER:=Luiz Angelo Daros de Luca <[email protected]>
 PKG_LICENSE:=GPL-3.0-or-later
@@ -26,7 +26,6 @@ PKG_BUILD_DEPENDS:=!USE_GLIBC:argp-standalone
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
-include $(INCLUDE_DIR)/host-build.mk
 
 define Package/elfutils/Default
   SECTION:=libs
@@ -62,6 +61,8 @@ CONFIGURE_ARGS += --disable-nls
 endif
 
 HOST_CONFIGURE_ARGS += \
+	--disable-shared \
+	--disable-nls \
 	--disable-debuginfod \
 	--disable-libdebuginfod \
 	--without-lzma \
@@ -110,7 +111,6 @@ define Package/libelf/install
 endef
 
 # these lines need to be ordered by dependency because of ABI versioning
-$(eval $(call HostBuild))
 $(eval $(call BuildPackage,libelf))
 $(eval $(call BuildPackage,libdw))
 $(eval $(call BuildPackage,libasm))

target/linux/bcm63xx/patches-5.10/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch

@@ -99,7 +99,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  		if (ret < 0) {
  			pr_err("%s: failed to add hogs for %pOF\n", __func__,
  			       rd->dn);
-@@ -1035,9 +1045,11 @@ int of_gpiochip_add(struct gpio_chip *ch
+@@ -1037,9 +1047,11 @@ int of_gpiochip_add(struct gpio_chip *ch
 
  	of_node_get(chip->of_node);
 

target/linux/bcm63xx/patches-5.10/400-bcm963xx_flashmap.patch

@@ -23,15 +23,15 @@ Signed-off-by: Axel Gembe <[email protected]>
  	.width			= 2,
 --- a/drivers/mtd/parsers/redboot.c
 +++ b/drivers/mtd/parsers/redboot.c
-@@ -84,6 +84,7 @@ static int parse_redboot_partitions(stru
+@@ -85,6 +85,7 @@ static int parse_redboot_partitions(stru
  	int nulllen = 0;
  	int numslots;
  	unsigned long offset;
 +	unsigned long fis_origin = 0;
  #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
  	static char nullstring[] = "unallocated";
  #endif
-@@ -190,6 +191,16 @@ static int parse_redboot_partitions(stru
+@@ -191,6 +192,16 @@ static int parse_redboot_partitions(stru
  		goto out;
  	}
 
@@ -48,7 +48,7 @@ Signed-off-by: Axel Gembe <[email protected]>
  	for (i = 0; i < numslots; i++) {
  		struct fis_list *new_fl, **prev;
 
-@@ -210,10 +221,10 @@ static int parse_redboot_partitions(stru
+@@ -211,10 +222,10 @@ static int parse_redboot_partitions(stru
  			goto out;
  		}
  		new_fl->img = &buf[i];

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 <[email protected]>
  	struct nft_set			*set;
 --- a/net/netfilter/nf_tables_api.c
 +++ b/net/netfilter/nf_tables_api.c
-@@ -892,6 +892,12 @@ static void nf_tables_table_disable(stru
+@@ -893,6 +893,12 @@ static void nf_tables_table_disable(stru
  	nft_table_disable(net, table, 0);
  }
 
@@ -47,7 +47,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
  static int nf_tables_updtable(struct nft_ctx *ctx)
  {
  	struct nft_trans *trans;
-@@ -915,19 +921,17 @@ static int nf_tables_updtable(struct nft
+@@ -916,19 +922,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 <[email protected]>
  	nft_trans_table_update(trans) = true;
  	list_add_tail(&trans->list, &ctx->net->nft.commit_list);
  	return 0;
-@@ -7923,11 +7927,10 @@ static int nf_tables_commit(struct net *
+@@ -7931,11 +7935,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 <[email protected]>
  			} else {
  				nft_clear(net, trans->ctx.table);
  			}
-@@ -8140,11 +8143,9 @@ static int __nf_tables_abort(struct net
+@@ -8148,11 +8151,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/800-GPIO-add-named-gpio-exports.patch

@@ -15,7 +15,7 @@ Signed-off-by: John Crispin <[email protected]>
 
  #include "gpiolib.h"
  #include "gpiolib-of.h"
-@@ -1044,3 +1046,72 @@ void of_gpiochip_remove(struct gpio_chip
+@@ -1046,3 +1048,72 @@ void of_gpiochip_remove(struct gpio_chip
  {
  	of_node_put(chip->of_node);
  }

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

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

target/linux/generic/pending-5.10/420-mtd-redboot_space.patch

@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
 
 --- a/drivers/mtd/parsers/redboot.c
 +++ b/drivers/mtd/parsers/redboot.c
-@@ -279,14 +279,21 @@ static int parse_redboot_partitions(stru
+@@ -280,14 +280,21 @@ static int parse_redboot_partitions(stru
  #endif
  		names += strlen(names)+1;
 

target/linux/generic/pending-5.10/811-pci_disable_usb_common_quirks.patch

@@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  #endif  /*  __LINUX_USB_PCI_QUIRKS_H  */
 --- a/include/linux/usb/hcd.h
 +++ b/include/linux/usb/hcd.h
-@@ -486,7 +486,14 @@ extern int usb_hcd_pci_probe(struct pci_
+@@ -487,7 +487,14 @@ extern int usb_hcd_pci_probe(struct pci_
  extern void usb_hcd_pci_remove(struct pci_dev *dev);
  extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
 

target/linux/ipq807x/patches-5.10/001-v5.11-remoteproc-sysmon-Expose-the-shutdown-result.patch

@@ -54,15 +54,15 @@ Signed-off-by: Bjorn Andersson <[email protected]>
  #endif
 --- a/drivers/remoteproc/qcom_sysmon.c
 +++ b/drivers/remoteproc/qcom_sysmon.c
-@@ -44,6 +44,7 @@ struct qcom_sysmon {
+@@ -45,6 +45,7 @@ struct qcom_sysmon {
  	struct mutex lock;
 
  	bool ssr_ack;
 +	bool shutdown_acked;
 
  	struct qmi_handle qmi;
  	struct sockaddr_qrtr ssctl;
-@@ -115,10 +116,13 @@ out_unlock:
+@@ -116,10 +117,13 @@ out_unlock:
  /**
   * sysmon_request_shutdown() - request graceful shutdown of remote
   * @sysmon:	sysmon context
@@ -77,7 +77,7 @@ Signed-off-by: Bjorn Andersson <[email protected]>
  	int ret;
 
  	mutex_lock(&sysmon->lock);
-@@ -141,9 +145,13 @@ static void sysmon_request_shutdown(stru
+@@ -142,9 +146,13 @@ static void sysmon_request_shutdown(stru
  	if (!sysmon->ssr_ack)
  		dev_err(sysmon->dev,
  			"unexpected response to sysmon shutdown request\n");
@@ -91,7 +91,7 @@ Signed-off-by: Bjorn Andersson <[email protected]>
  }
 
  static int sysmon_callback(struct rpmsg_device *rpdev, void *data, int count,
-@@ -297,14 +305,33 @@ static struct qmi_msg_handler qmi_indica
+@@ -298,14 +306,33 @@ static struct qmi_msg_handler qmi_indica
  	{}
  };
 
@@ -126,7 +126,7 @@ Signed-off-by: Bjorn Andersson <[email protected]>
  	int ret;
 
  	reinit_completion(&sysmon->ind_comp);
-@@ -312,7 +339,7 @@ static void ssctl_request_shutdown(struc
+@@ -313,7 +340,7 @@ static void ssctl_request_shutdown(struc
  	ret = qmi_txn_init(&sysmon->qmi, &txn, ssctl_shutdown_resp_ei, &resp);
  	if (ret < 0) {
  		dev_err(sysmon->dev, "failed to allocate QMI txn\n");
@@ -135,7 +135,7 @@ Signed-off-by: Bjorn Andersson <[email protected]>
  	}
 
  	ret = qmi_send_request(&sysmon->qmi, &sysmon->ssctl, &txn,
-@@ -320,27 +347,23 @@ static void ssctl_request_shutdown(struc
+@@ -321,27 +348,23 @@ static void ssctl_request_shutdown(struc
  	if (ret < 0) {
  		dev_err(sysmon->dev, "failed to send shutdown request\n");
  		qmi_txn_cancel(&txn);
@@ -173,7 +173,7 @@ Signed-off-by: Bjorn Andersson <[email protected]>
  }
 
  /**
-@@ -510,6 +533,9 @@ static void sysmon_stop(struct rproc_sub
+@@ -514,6 +537,9 @@ static void sysmon_stop(struct rproc_sub
  		.subsys_name = sysmon->name,
  		.ssr_event = SSCTL_SSR_EVENT_BEFORE_SHUTDOWN
  	};
@@ -183,8 +183,8 @@ Signed-off-by: Bjorn Andersson <[email protected]>
 
  	mutex_lock(&sysmon->state_lock);
  	sysmon->state = SSCTL_SSR_EVENT_BEFORE_SHUTDOWN;
-@@ -521,9 +547,11 @@ static void sysmon_stop(struct rproc_sub
- 		return;
+@@ -530,9 +556,11 @@ static void sysmon_stop(struct rproc_sub
+ 	}
 
  	if (sysmon->ssctl_version)
 -		ssctl_request_shutdown(sysmon);
@@ -197,7 +197,7 @@ Signed-off-by: Bjorn Andersson <[email protected]>
  }
 
  static void sysmon_unprepare(struct rproc_subdev *subdev)
-@@ -682,6 +710,22 @@ void qcom_remove_sysmon_subdev(struct qc
+@@ -692,6 +720,22 @@ void qcom_remove_sysmon_subdev(struct qc
  EXPORT_SYMBOL_GPL(qcom_remove_sysmon_subdev);
 
  /**

target/linux/ipq807x/patches-5.10/010-v5.11-PCI-dwc-Drop-the-.set_num_vectors-host-op.patch

@@ -90,7 +90,7 @@ Cc: [email protected]
 
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
-@@ -990,11 +990,6 @@ static int tegra_pcie_dw_link_up(struct
+@@ -988,11 +988,6 @@ static int tegra_pcie_dw_link_up(struct
  	return !!(val & PCI_EXP_LNKSTA_DLLLA);
  }
 
@@ -102,15 +102,15 @@ Cc: [email protected]
  static int tegra_pcie_dw_start_link(struct dw_pcie *pci)
  {
  	struct tegra_pcie_dw *pcie = to_tegra_pcie(pci);
-@@ -1019,7 +1014,6 @@ static const struct dw_pcie_ops tegra_dw
+@@ -1017,7 +1012,6 @@ static const struct dw_pcie_ops tegra_dw
 
  static struct dw_pcie_host_ops tegra_pcie_dw_host_ops = {
  	.host_init = tegra_pcie_dw_host_init,
 -	.set_num_vectors = tegra_pcie_set_msi_vec_num,
  };
 
  static void tegra_pcie_disable_phy(struct tegra_pcie_dw *pcie)
-@@ -2003,6 +1997,7 @@ static int tegra_pcie_dw_probe(struct pl
+@@ -2002,6 +1996,7 @@ static int tegra_pcie_dw_probe(struct pl
  	pci->n_fts[1] = FTS_VAL;
 
  	pp = &pci->pp;

target/linux/ipq807x/patches-5.10/011-v5.11-PCI-dwc-Move-MSI-interrupt-setup-into-DWC-common-cod.patch

@@ -229,7 +229,7 @@ Cc: [email protected]
  	return dw_pcie_host_init(&pci->pp);
 --- a/drivers/pci/controller/dwc/pcie-qcom.c
 +++ b/drivers/pci/controller/dwc/pcie-qcom.c
-@@ -1428,14 +1428,6 @@ static int qcom_pcie_probe(struct platfo
+@@ -1426,14 +1426,6 @@ static int qcom_pcie_probe(struct platfo
 
  	pp->ops = &qcom_pcie_dw_ops;
 
@@ -256,7 +256,7 @@ Cc: [email protected]
  	if (ret) {
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
-@@ -1554,14 +1554,6 @@ static int tegra_pcie_config_rp(struct t
+@@ -1552,14 +1552,6 @@ static int tegra_pcie_config_rp(struct t
  	char *name;
  	int ret;
 

target/linux/ipq807x/patches-5.10/013-v5.11-PCI-dwc-Move-link-handling-into-common-code.patch

@@ -525,7 +525,7 @@ Cc: [email protected]
  }
 
  static void qcom_pcie_2_1_0_ltssm_enable(struct qcom_pcie *pcie)
-@@ -1284,15 +1281,8 @@ static int qcom_pcie_host_init(struct pc
+@@ -1282,15 +1279,8 @@ static int qcom_pcie_host_init(struct pc
 
  	qcom_ep_reset_deassert(pcie);
 
@@ -542,7 +542,7 @@ Cc: [email protected]
  err_disable_phy:
  	phy_power_off(pcie->phy);
  err_deinit:
-@@ -1359,6 +1349,7 @@ static const struct qcom_pcie_ops ops_2_
+@@ -1357,6 +1347,7 @@ static const struct qcom_pcie_ops ops_2_
 
  static const struct dw_pcie_ops dw_pcie_ops = {
  	.link_up = qcom_pcie_link_up,
@@ -552,7 +552,7 @@ Cc: [email protected]
  static int qcom_pcie_probe(struct platform_device *pdev)
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
-@@ -1549,7 +1549,6 @@ static int tegra_pcie_deinit_controller(
+@@ -1547,7 +1547,6 @@ static int tegra_pcie_deinit_controller(
 
  static int tegra_pcie_config_rp(struct tegra_pcie_dw *pcie)
  {

target/linux/ipq807x/patches-5.10/014-v5.11-PCI-dwc-Move-dw_pcie_msi_init-into-core.patch

@@ -220,7 +220,7 @@ Cc: [email protected]
  }
 --- a/drivers/pci/controller/dwc/pcie-qcom.c
 +++ b/drivers/pci/controller/dwc/pcie-qcom.c
-@@ -1277,8 +1277,6 @@ static int qcom_pcie_host_init(struct pc
+@@ -1275,8 +1275,6 @@ static int qcom_pcie_host_init(struct pc
  	}
 
  	dw_pcie_setup_rc(pp);
@@ -251,7 +251,7 @@ Cc: [email protected]
  static int spear13xx_pcie_link_up(struct dw_pcie *pci)
 --- a/drivers/pci/controller/dwc/pcie-tegra194.c
 +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
-@@ -765,8 +765,6 @@ static void tegra_pcie_enable_msi_interr
+@@ -763,8 +763,6 @@ static void tegra_pcie_enable_msi_interr
  	struct tegra_pcie_dw *pcie = to_tegra_pcie(pci);
  	u32 val;
 

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

@@ -15,7 +15,7 @@ Acked-by: Stephen Boyd <[email protected]>
 
 --- a/drivers/clk/qcom/gcc-ipq8074.c
 +++ b/drivers/clk/qcom/gcc-ipq8074.c
-@@ -4744,6 +4744,7 @@ static const struct qcom_reset_map gcc_i
+@@ -4789,6 +4789,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 },