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

* https://github.com/coolsnowwolf/lede: (26 commits)
  pacakge: add mosdns and luci-app-mosdns from sbwml
  kernel: bump 5.15 to 5.15.80 (coolsnowwolf#10506)
  kernel: bump 6.0 to 6.0.10 (coolsnowwolf#10505)
  kernel: bump 5.10 to 5.10.156 (coolsnowwolf#10498)
  kernel: bump 5.4 to 5.4.225
  tools/mpfr: update to 4.1.1 (coolsnowwolf#10502)
  Update feeds.conf.default
  iwinfo: add hardware id for MT7922 devices support
  Revert "x86: fix Bintel's ZHITAI Ti Plus 5000 fw bug"
  ipq807x: disable br-nf after qca-nss-ecm start (coolsnowwolf#10488)
  x86: fix Bintel's ZHITAI Ti Plus 5000 fw bug
  rockchip: 5.15: add missing kernel config
  generic: 5.15: add missing PAGE_POOL_STATS config
  kernel: add CONFIG_NVMEM_U_BOOT_ENV symbol to configs
  ipq60xx: add 360_v6 ath11k wifi BDF
  ath11k-wifi: add board bdf files package
  kernel: sysctl: update nf_ct_expect settings for fullcone nat mode 2
  Revert "dnsmasq: bump to v2.87"
  x86: add kmod-tg3 by default
  upx: fix hash (coolsnowwolf#10479)
  ...

feeds.conf.default

@@ -2,7 +2,8 @@ src-git packages https://github.com/coolsnowwolf/packages
 src-git luci https://github.com/coolsnowwolf/luci
 src-git routing https://github.com/coolsnowwolf/routing
 src-git telephony https://git.openwrt.org/feed/telephony.git
-src-git oui https://github.com/zhaojh329/oui.git
+#src-git helloworld https://github.com/fw876/helloworld.git
+#src-git oui https://github.com/zhaojh329/oui.git
 #src-git video https://github.com/openwrt/video.git
 #src-git targets https://github.com/openwrt/targets.git
 #src-git oldpackages http://git.openwrt.org/packages.git

include/kernel-5.10

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .155
-LINUX_KERNEL_HASH-5.10.155 = f1b027526c58e7bd127f35b17736e4a6c865866b9048898f05c5358d4d52d4f3
+LINUX_VERSION-5.10 = .156
+LINUX_KERNEL_HASH-5.10.156 = 679e9964ca720027967391b61db990ceb7868e93e203f87724f18310f4955923

include/kernel-5.15

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .79
-LINUX_KERNEL_HASH-5.15.79 = cba39031dbc0eed0785b8afdc8c58cf23df83e47001b2354fa44486ae699c154
+LINUX_VERSION-5.15 = .80
+LINUX_KERNEL_HASH-5.15.80 = 3b321a6466d2021f60ed8d4e33bba21db2f23efc2ddd2d9fb775393d9afdfd4d

include/kernel-5.4

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.4 = .224
-LINUX_KERNEL_HASH-5.4.224 = 8b7df25b5560620eb2776d7b7c67569764b3916ff2f596767f72567b38d13d36
+LINUX_VERSION-5.4 = .225
+LINUX_KERNEL_HASH-5.4.225 = 59f596f6714317955cf481590babcf015aff2bc1900bd8e8dc8f7af73bc560aa

include/kernel-6.0

@@ -1,2 +1,2 @@
-LINUX_VERSION-6.0 = .9
-LINUX_KERNEL_HASH-6.0.9 = 6114a208e82739b4a1ab059ace35262be2a83be34cd1ae23cb8a09337db831c7
+LINUX_VERSION-6.0 = .10
+LINUX_KERNEL_HASH-6.0.10 = 39e57fcd84cd70bfa3e1a4185d3aa0ed7f1432f24c6548d16326b0c3c9541dd0

package/firmware/ath11k-wifi/Makefile

@@ -0,0 +1,92 @@
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/version.mk
+
+PKG_NAME:=ath11k-wifi
+PKG_RELEASE:=1
+PKG_FLAGS:=nonshared
+
+include $(INCLUDE_DIR)/package.mk
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Compile
+endef
+
+# Use ath10k-bdencoder from https://github.com/qca/qca-swiss-army-knife.git
+# to generate the board-* files here.
+#
+# This is intended to be used on an interim basis until device-specific
+# board data for new devices is available through the upstream compilation
+#
+# Please send a mail with your device-specific board files upstream.
+# You can find instructions and examples on the linux-wireless wiki:
+# <https://wireless.wiki.kernel.org/en/users/drivers/ath10k/boardfiles>
+
+ALLWIFIBOARDS:= \
+	gl-ax1800 \
+	gl-axt1800 \
+	qihoo_v6
+
+ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ath11k-wifi-$(BOARD))
+
+define Package/ath11k-wifi-default
+  SUBMENU:=ath11k Board-Specific Overrides
+  SECTION:=firmware
+  CATEGORY:=Firmware
+  DEPENDS:=@TARGET_ipq60xx
+  TITLE:=Custom Board
+endef
+
+define ath11k-wifi-install-one-to
+  $(INSTALL_DIR)  $(2)/lib/firmware/ath11k/$(3)/
+  $(INSTALL_DATA) $(1) $(2)/lib/firmware/ath11k/$(3)/board-2.bin
+endef
+
+define ath11k-wifi-install-one
+  $(if $(filter $(suffix $(1)),.IPQ6018 .ipq6018),\
+    $(call ath11k-wifi-install-one-to,$(1),$(2),IPQ6018/hw1.0),\
+    $(error Unrecognized board-file suffix '$(suffix $(1))' for '$(1)')\
+  )
+
+endef
+# Blank line required at end of above define due to foreach context
+
+define generate-ath11k-wifi-package
+  define Package/ath11k-wifi-$(1)
+    $(call Package/ath11k-wifi-default)
+    TITLE:=board-2.bin Overrides for $(2)
+    CONFLICTS:=$(PREV_BOARD)
+  endef
+
+  define Package/ath11k-wifi-$(1)/description
+The $(2) requires board-specific, reference ("cal") data
+that is not yet present in the upstream wireless firmware distribution.
+
+This package supplies board-2.bin file(s) that, in the interim,
+overwrite those supplied by the ath10k-firmware-* packages.
+
+This is package is only necessary for the $(2).
+
+Do not install it for any other device!
+  endef
+
+  define Package/ath11k-wifi-$(1)/install-overlay
+    $$$$(foreach IPQ_WIFI_BOARD_FILE,$$$$(wildcard board-$(1).*),\
+      $$$$(call ath11k-wifi-install-one,$$$$(IPQ_WIFI_BOARD_FILE),$$(1)))
+  endef
+
+  PREV_BOARD+=ath11k-wifi-$(1)
+endef
+
+# Add board name to ALLWIFIBOARDS
+# Place files in this directory as board-<devicename>.<qca4019|qca9888|qca9984>
+# Add $(eval $(call generate-ath11k-wifi-package,<devicename>,<display name>))
+
+$(eval $(call generate-ath11k-wifi-package,gl-ax1800,Gl.iNET AX1800))
+$(eval $(call generate-ath11k-wifi-package,gl-axt1800,Gl.iNET AXT1800))
+$(eval $(call generate-ath11k-wifi-package,qihoo_v6,QIHOO 360V6))
+
+
+$(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))

package/firmware/ath11k-wifi/qdss_trace_config.bin

@@ -0,0 +1,99 @@
+//This comment and parser will ignore
+//Tracer scenario(or commands) always
+//starts with start keyword
+//Below commands to enable Event traces on UMAC,MAC0,MAC1
+//seq_start;
+//seq_type:mem_req;
+//memory size always given in KB. beow example reserves 3 buffers segments of 16 KB.
+//sink:etr_ddr,0x1,0x1000;
+//seq_end;
+//Below commands to enable Event traces on UMAC,MAC0,MAC1
+seq_start;
+seq_type:mac_event_trace;
+sink:etr_ddr;
+subsys_cfg_start:mac0;
+hwsch:0x1, 0x000FFFF1,0x1036052C,0x0,0x0;
+rxdma:0x2, 0x3400,0x8000,0x0,0x0;
+crypto:0x3, 0xF79B3770,0x0,0x0,0x0;
+txpcu:0x4, 0xD687F4E7,0x20000092,0x0,0x0;
+txole:0x5, 0x640F0622,0x2,0x0,0x0;
+pdg:0x6, 0x3C800706,0x0,0x0,0x0;
+subsys_cfg_end:mac0;
+subsys_cfg_start:mac1;
+hwsch:0x7, 0x000FFFF1,0x1036052C,0x0,0x0;
+rxdma:0x8, 0x3400,0x8000,0x0,0x0;
+crypto:0x9, 0xF79B3770,0x0,0x0,0x0;
+txpcu:0xA, 0xD687F4E7,0x20000092,0x0,0x0;
+txole:0xB, 0x640F0622,0x2,0x0,0x0;
+pdg:0xC, 0x3C800706,0x0,0x0,0x0;
+subsys_cfg_end:mac1;
+swap:0xFFFFFFFF;
+trigger_start:trc;
+wfi:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+ts0:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+ts1:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+ts2:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+ts3:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+ts4:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+trigger_end:trc;
+memw:0xFFFFFFFF,0xFFFFFFFF;
+seq_end;
+// Below commands to enable obo trace on the mac0
+//seq_start;
+//seq_type:mac_obo_trace;
+//sink:etb_wcss;
+//subsys_cfg_start:mac0;
+//hwsch:0x1,0xABCDABCD;
+//subsys_cfg_end:mac0;
+//swap:0xABCDABCD;
+//trigger_start:trc;
+//wfi:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+//ts0:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+//ts1:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+//ts2:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+//ts3:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+//ts4:0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF;
+//trigger_end:trc;
+//memw:0xFFFFFFFF,0xFFFFFFFF;
+//seq_end;
+// Below commands to enable TLV trace on the mac0
+//seq_start;
+//seq_type:mac_tlv_trace;
+//sink:etb_wcss;
+//subsys_cfg_start:mac0;
+//tlv_port:PDG_TXDMA_TLV;
+//subsys_cfg_end:mac0;
+//seq_end;
+// Below commands to enable q6 etm
+//seq_start;
+//seq_type:q6_etm_trace;
+//sink:etr_ddr;
+//seq_end;
+// Below commands to enable umac noc traces
+//seq_start;
+//seq_type:umac_noc_trace;
+//sink:etb_wcss;
+//ctrl:0x12;
+//port_sel:0x4;
+//lut:0xA;
+//routeid_base:0x01000000;
+//routeid_mask:0x01c00000;
+//addr_lo:0x0;
+//addr_hi:0x0;
+//win_size:0x25;
+//req_opcode:0x3;
+//res_status:0x3;
+//fltr_len:0xF;
+//async_period:0xC;
+//seq_end;
+// Below commands to enable umac noc traces
+//seq_start;
+//seq_type:phy_tlv_trace;
+//sink:etr_ddr;
+//seq_end;
+//seq_start;
+//seq_type:phy_event_trace;
+//sink:etr_ddr;
+//phya:0x1,0x1;
+//phyb:0x1,0x1;
+//seq_end;

package/kernel/linux/files/sysctl-nf-conntrack.conf

@@ -7,4 +7,6 @@ net.netfilter.nf_conntrack_max=65535
 net.netfilter.nf_conntrack_tcp_timeout_established=7440
 net.netfilter.nf_conntrack_udp_timeout=60
 net.netfilter.nf_conntrack_udp_timeout_stream=180
-net.netfilter.nf_conntrack_helper=1
+net.netfilter.nf_conntrack_helper=1
+net.netfilter.nf_conntrack_buckets=16384
+net.netfilter.nf_conntrack_expect_max=16384

package/kernel/linux/modules/hwmon.mk

@@ -427,6 +427,21 @@ endef
 $(eval $(call KernelPackage,hwmon-sht21))
 
 
+define KernelPackage/hwmon-sht3x
+  TITLE:=Sensiron SHT3x and compat. monitoring support
+  KCONFIG:=CONFIG_SENSORS_SHT3x
+  FILES:=$(LINUX_DIR)/drivers/hwmon/sht3x.ko
+  AUTOLOAD:=$(call AutoProbe,sht3x)
+  $(call AddDepends/hwmon,+kmod-i2c-core +kmod-lib-crc8)
+endef
+
+define KernelPackage/hwmon-sht3x/description
+ Kernel module for Sensirion SHT3x temperature and humidity sensors chip
+endef
+
+$(eval $(call KernelPackage,hwmon-sht3x))
+
+
 define KernelPackage/hwmon-tmp102
   TITLE:=Texas Instruments TMP102 monitoring support
   KCONFIG:=CONFIG_SENSORS_TMP102

package/lean/luci-app-mosdns/Makefile

@@ -0,0 +1,19 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=luci-app-mosdns
+PKG_VERSION:=1.4.3
+PKG_RELEASE:=2
+
+LUCI_TITLE:=LuCI Support for mosdns
+LUCI_PKGARCH:=all
+LUCI_DEPENDS:=+mosdns +jsonfilter +luci-compat +curl +v2ray-geoip +v2ray-geosite
+
+define Package/$(PKG_NAME)/conffiles
+/etc/config/mosdns
+/etc/mosdns/config_custom.yaml
+/etc/mosdns/rule
+endef
+
+include $(TOPDIR)/feeds/luci/luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature

package/lean/luci-app-mosdns/luasrc/controller/mosdns.lua

@@ -0,0 +1,42 @@
+module("luci.controller.mosdns", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/mosdns") then
+		return
+	end
+
+	local page = entry({"admin", "services", "mosdns"}, alias("admin", "services", "mosdns", "basic"), _("MosDNS"), 30)
+	page.dependent = true
+	page.acl_depends = { "luci-app-mosdns" }
+
+	entry({"admin", "services", "mosdns", "basic"}, cbi("mosdns/basic"), _("Basic Setting"), 1).leaf = true
+	entry({"admin", "services", "mosdns", "rule_list"}, cbi("mosdns/rule_list"), _("Rule List"), 2).leaf = true
+	entry({"admin", "services", "mosdns", "update"}, cbi("mosdns/update"), _("Geodata Update"), 3).leaf = true
+	entry({"admin", "services", "mosdns", "log"}, cbi("mosdns/log"), _("Logs"), 4).leaf = true
+	entry({"admin", "services", "mosdns", "status"}, call("act_status")).leaf = true
+	entry({"admin", "services", "mosdns", "get_log"}, call("get_log")).leaf = true
+	entry({"admin", "services", "mosdns", "clear_log"}, call("clear_log")).leaf = true
+	entry({"admin", "services", "mosdns", "geo_update"}, call("geo_update")).leaf = true
+end
+
+function act_status()
+	local e = {}
+	e.running = luci.sys.call("pgrep -f mosdns >/dev/null") == 0
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(e)
+end
+
+function get_log()
+	luci.http.write(luci.sys.exec("cat $(/usr/share/mosdns/mosdns.sh logfile)"))
+end
+
+function clear_log()
+	luci.sys.call("cat /dev/null > $(/usr/share/mosdns/mosdns.sh logfile)")
+end
+
+function geo_update()
+	local e = {}
+	e.updating = luci.sys.call("/usr/share/mosdns/mosdns.sh geodata >/dev/null") == 0
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(e)
+end