Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2024-03-24 21:24:08 +08:00 · 2024-03-24 21:24:08 +08:00 · 4d22a8a2c4
commit 4d22a8a2c4
parent 4e996ccdf5 8753022aea
108 changed files with 303 additions and 154 deletions
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@ -50,6 +50,15 @@ config KERNEL_ARM_PMU
 	default y if TARGET_armsr_armv8
 	depends on (arm || aarch64)

+config KERNEL_RISCV_PMU
+	bool
+	select KERNEL_RISCV_PMU_SBI
+	depends on riscv64
+
+config KERNEL_RISCV_PMU_SBI
+	bool
+	depends on riscv64
+
 config KERNEL_X86_VSYSCALL_EMULATION
 	bool "Enable vsyscall emulation"
 	depends on x86_64
@ -70,6 +79,7 @@ config KERNEL_X86_VSYSCALL_EMULATION
 config KERNEL_PERF_EVENTS
 	bool "Compile the kernel with performance events and counters"
 	select KERNEL_ARM_PMU if (arm || aarch64)
+	select KERNEL_RISCV_PMU if riscv64

 config KERNEL_PROFILING
 	bool "Compile the kernel with profiling enabled"
--- a/include/download.mk
+++ b/include/download.mk
@ -10,7 +10,7 @@ LEDE_GIT = $(PROJECT_GIT)

 ifdef PKG_SOURCE_VERSION
  ifndef PKG_VERSION
-    PKG_VERSION := $(if $(PKG_SOURCE_DATE),$(PKG_SOURCE_DATE)-)$(call version_abbrev,$(PKG_SOURCE_VERSION))
+    PKG_VERSION := $(if $(PKG_SOURCE_DATE),$(subst -,.,$(PKG_SOURCE_DATE)),0)~$(call version_abbrev,$(PKG_SOURCE_VERSION))
  endif
  PKG_SOURCE_SUBDIR ?= $(PKG_NAME)-$(PKG_VERSION)
  PKG_SOURCE ?= $(PKG_SOURCE_SUBDIR).tar.xz
--- a/include/kernel.mk
+++ b/include/kernel.mk
@ -211,8 +211,8 @@ define KernelPackage
    SECTION:=kernel
    CATEGORY:=Kernel modules
    DESCRIPTION:=$(DESCRIPTION)
-    EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC))
-    VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),+$(PKG_VERSION))-$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE))
+    EXTRA_DEPENDS:=kernel (=$(LINUX_VERSION)~$(LINUX_VERMAGIC)-r$(LINUX_RELEASE))
+    VERSION:=$(LINUX_VERSION)$(if $(PKG_VERSION),.$(PKG_VERSION))-r$(if $(PKG_RELEASE),$(PKG_RELEASE),$(LINUX_RELEASE))
    PKGFLAGS:=$(PKGFLAGS)
    $(call KernelPackage/$(1))
    $(call KernelPackage/$(1)/$(BOARD))
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@ -23,7 +23,7 @@ define Package/Default
  SOURCE:=$(patsubst $(TOPDIR)/%,%,$(patsubst $(TOPDIR)/package/%,feeds/base/%,$(CURDIR)))
  ifneq ($(PKG_VERSION),)
    ifneq ($(PKG_RELEASE),)
-      VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
+      VERSION:=$(PKG_VERSION)-r$(PKG_RELEASE)
    else
      VERSION:=$(PKG_VERSION)
    endif
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@ -42,7 +42,7 @@ define Package/base-files
  DEPENDS:=+netifd +libc +jsonfilter +SIGNED_PACKAGES:usign +SIGNED_PACKAGES:openwrt-keyring +NAND_SUPPORT:ubi-utils +fstools +fwtool
  TITLE:=Base filesystem for OpenWrt
  URL:=http://openwrt.org/
-  VERSION:=$(PKG_RELEASE)-$(REVISION)
+  VERSION:=$(PKG_RELEASE)~$(lastword $(subst -, ,$(REVISION)))
 endef

 define Package/base-files/conffiles
--- a/package/boot/uboot-envtools/files/kirkwood
+++ b/package/boot/uboot-envtools/files/kirkwood
@ -17,6 +17,7 @@ cloudengines,pogoe02|\
 cloudengines,pogoplugv4|\
 globalscale,sheevaplug|\
 iom,ix2-200|\
+iom,ix4-200d|\
 linksys,e4200-v2|\
 linksys,ea4500|\
 netgear,readynas-duo-v2|\
--- a/package/devel/leds/Makefile
+++ b/package/devel/leds/Makefile
@ -14,7 +14,6 @@ include $(INCLUDE_DIR)/package.mk
 define Package/leds/default
  SECTION:=devel
  CATEGORY:=Development
-  VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE)
  URL:=http://www.kernel.org
 endef

--- a/package/firmware/ath10k-ct-firmware/Makefile
+++ b/package/firmware/ath10k-ct-firmware/Makefile
@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=ath10k-ct-firmware
-PKG_VERSION:=2020-11-08
+PKG_VERSION:=2020.11.08
 PKG_RELEASE:=1

 DL_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
--- a/package/firmware/ath11k-firmware/Makefile
+++ b/package/firmware/ath11k-firmware/Makefile
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=ath11k-firmware
 PKG_SOURCE_DATE:=2024-03-14
 PKG_SOURCE_VERSION:=795809c7041582bd51bdfaa1f548b916ae8d4382
-PKG_MIRROR_HASH:=7d6d2946531c336a402f51e453d5b0e2b5c17201432d6cfa5482eb3626270212
+PKG_MIRROR_HASH:=5018bbfed6da372b9f2ab9b152d3dfd09718713310d83232a699545b53c84b2e
 PKG_RELEASE:=2

 PKG_SOURCE_PROTO:=git
--- a/package/firmware/broadcom-sprom/Makefile
+++ b/package/firmware/broadcom-sprom/Makefile
@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=broadcom-sprom
 PKG_SOURCE_DATE:=2023-04-27
 PKG_SOURCE_VERSION:=d36f7fcb37711106a3a2652b576436cb09aa5b6f
-PKG_MIRROR_HASH:=fde251ab4ed26d61c95269316119710d6ccb8fe30ef13305d08b3e7d7d8a4c60
+PKG_MIRROR_HASH:=70c68c923a661f40842e8800203b4b3a2675f6735c35aa3479f856cc54ad750c
 PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
--- a/package/kernel/ath10k-ct/Makefile
+++ b/package/kernel/ath10k-ct/Makefile
@ -10,7 +10,7 @@ PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2023-06-05
 PKG_SOURCE_VERSION:=fadd0768cbd22248a60efbb219ccefc9d86cd78c
-PKG_MIRROR_HASH:=513f62765ba3a2f423099426fbba86b854f3de0ab13ec2ab6e2780577ea75f95
+PKG_MIRROR_HASH:=94b5f99245bb35edbfeff08b32f03272c4e6fac8eabcd2a88e85835e088bc534

 # Build the 6.4 ath10k-ct driver version.
 # Probably this should match as closely as
--- a/package/kernel/linux/Makefile
+++ b/package/kernel/linux/Makefile
@ -52,7 +52,7 @@ define Package/kernel
  CATEGORY:=Kernel
  DEFAULT:=y
  TITLE:=Virtual kernel package
-  VERSION:=$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)
+  VERSION:=$(LINUX_VERSION)~$(LINUX_VERMAGIC)-r$(LINUX_RELEASE)
  URL:=http://www.kernel.org/
  PKG_FLAGS:=nonshared
 endef
--- a/package/kernel/mac80211/patches/ath/432-carl9170_re-fix_fortified-memset_warning.patch
+++ b/package/kernel/mac80211/patches/ath/432-carl9170_re-fix_fortified-memset_warning.patch
@ -0,0 +1,51 @@
+[PATCH 1/2] carl9170: re-fix fortified-memset warning
+@ 2023-06-23 15:23 Arnd Bergmann
+  2023-06-23 15:24 ` [PATCH 2/2] mac80211: make ieee80211_tx_info padding explicit Arnd Bergmann
+                   ` (2 more replies)
+  0 siblings, 3 replies; 9+ messages in thread
+From: Arnd Bergmann @ 2023-06-23 15:23 UTC (permalink / raw)
+  To: Christian Lamparter, Kalle Valo, Kees Cook, Johannes Berg
+  Cc: Arnd Bergmann, linux-wireless, linux-kernel
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+The carl9170_tx_release() function sometimes triggers a fortified-memset
+warning in my randconfig builds:
+
+In file included from include/linux/string.h:254,
+                 from drivers/net/wireless/ath/carl9170/tx.c:40:
+In function 'fortify_memset_chk',
+    inlined from 'carl9170_tx_release' at drivers/net/wireless/ath/carl9170/tx.c:283:2,
+    inlined from 'kref_put' at include/linux/kref.h:65:3,
+    inlined from 'carl9170_tx_put_skb' at drivers/net/wireless/ath/carl9170/tx.c:342:9:
+include/linux/fortify-string.h:493:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
+  493 |                         __write_overflow_field(p_size_field, size);
+
+Kees previously tried to avoid this by using memset_after(), but it seems
+this does not fully address the problem. I noticed that the memset_after()
+here is done on a different part of the union (status) than the original
+cast was from (rate_driver_data), which may confuse the compiler.
+
+Unfortunately, the memset_after() trick does not work on driver_rates[]
+because that is part of an anonymous struct, and I could not get
+struct_group() to do this either. Using two separate memset() calls
+on the two members does address the warning though.
+
+Fixes: fb5f6a0e8063b ("mac80211: Use memset_after() to clear tx status")
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+---
+ drivers/net/wireless/ath/carl9170/tx.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/ath/carl9170/tx.c
+++ b/drivers/net/wireless/ath/carl9170/tx.c
+@@ -280,7 +280,8 @@ static void carl9170_tx_release(struct k
+ 	 * carl9170_tx_fill_rateinfo() has filled the rate information
+ 	 * before we get to this point.
+ 	 */
+-	memset_after(&txinfo->status, 0, rates);
+	memset(&txinfo->pad, 0, sizeof(txinfo->pad));
+	memset(&txinfo->rate_driver_data, 0, sizeof(txinfo->rate_driver_data));
+ 
+ 	if (atomic_read(&ar->tx_total_queued))
+ 		ar->tx_schedule = true;
--- a/package/kernel/mt76/Makefile
+++ b/package/kernel/mt76/Makefile
@ -10,7 +10,7 @@ PKG_SOURCE_URL:=https://github.com/openwrt/mt76
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2024-03-18
 PKG_SOURCE_VERSION:=2135e201e7a9339e018d4e2d4a33c73266e674d7
-PKG_MIRROR_HASH:=810f636c60c86e6a426c676c3bf7aaea2f711feb31f4a66889d485112b612745
+PKG_MIRROR_HASH:=530db8a70d18295677989aafc9c1757b151ef77e359985417f1d36e7d2415d33

 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_USE_NINJA:=0
--- a/package/kernel/nat46/Makefile
+++ b/package/kernel/nat46/Makefile
@ -3,7 +3,7 @@ include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=nat46

-PKG_MIRROR_HASH:=aeff95aa278ec1e197b59700284c0210f32b92c1fb757e5c3088bd00b3b403d4
+PKG_MIRROR_HASH:=fc3ce43f8680bba6ada7d793479c5961e609138304198b250609b968d1833bb4
 PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git
 PKG_SOURCE_DATE:=2022-09-19
 PKG_SOURCE_PROTO:=git
--- a/package/kernel/rtl8812au-ct/Makefile
+++ b/package/kernel/rtl8812au-ct/Makefile
@ -7,7 +7,7 @@ PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=

 PKG_SOURCE_URL:=https://github.com/greearb/rtl8812AU_8821AU_linux.git
-PKG_MIRROR_HASH:=748f5c58aa3f391222c0c43db35b9ff4c30c9c987ca052a5a3cdf36193e5821b
+PKG_MIRROR_HASH:=141633ba4d68fce3ae1eed59e79eec9107ae36614480630a6eccd97d5cee612a
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2022-10-26
 PKG_SOURCE_VERSION:=9b2b203a217e1320602a0eb07c338a1bfca0f5a6
--- a/package/libs/libnl-tiny/Makefile
+++ b/package/libs/libnl-tiny/Makefile
@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/libnl-tiny.git
 PKG_SOURCE_DATE:=2023-12-05
 PKG_SOURCE_VERSION:=965c4bf49658342ced0bd6e7cb069571b4a1ddff
-PKG_MIRROR_HASH:=93596c2686926a470b6bf322f6c166a420a08abe1ea715b4ae8c9df3de00eb28
+PKG_MIRROR_HASH:=4e166d01533aaaea5e01a2e3605ae224c3d632264936b6c40c07335e11e6b51b
 CMAKE_INSTALL:=1

 PKG_LICENSE:=LGPL-2.1
--- a/package/libs/libubox/Makefile
+++ b/package/libs/libubox/Makefile
@ -5,7 +5,7 @@ PKG_RELEASE=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git
-PKG_MIRROR_HASH:=071139fed757bea240d4ba8f55a0ff5a81862d23e16b39fc871ae07da78ae6a4
+PKG_MIRROR_HASH:=e07d0c8b92a9ef18d2459ebbbca38de20eeee657704320d4705578f895b78257
 PKG_SOURCE_DATE:=2024-01-26
 PKG_SOURCE_VERSION:=c1be505732e6d254464973bdeacb955214c76c46
 PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
--- a/package/libs/toolchain/Makefile
+++ b/package/libs/toolchain/Makefile
@ -27,7 +27,7 @@ define Package/gcc/Default
  SECTION:=libs
  CATEGORY:=Base system
  URL:=http://gcc.gnu.org/
-  VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE)
+  VERSION:=$(LIBGCC_VERSION)-r$(PKG_RELEASE)
 endef

 define Package/libgcc
@ -230,7 +230,7 @@ endef
 define Package/libc/Default
  SECTION:=libs
  CATEGORY:=Base system
-  VERSION:=$(LIBC_VERSION)-$(PKG_RELEASE)
+  VERSION:=$(LIBC_VERSION)-r$(PKG_RELEASE)
  DEPENDS:=+libgcc
  URL:=$(LIBC_URL)
 endef
--- a/package/libs/uclient/Makefile
+++ b/package/libs/uclient/Makefile
@ -5,7 +5,7 @@ PKG_RELEASE=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/uclient.git
-PKG_MIRROR_HASH:=16c6c97f45d9737fb40628ea22ae347541a1e37d8d1576e04ffbaa5fc92f3b6d
+PKG_MIRROR_HASH:=761d8b357eb0c37a0833cc76106948c5f2bfe9abe785728996a8d050a25b0a8a
 PKG_SOURCE_DATE:=2023-04-13
 PKG_SOURCE_VERSION:=007d945467499f43656b141171d31f5643b83a6c
 CMAKE_INSTALL:=1
--- a/package/libs/udebug/Makefile
+++ b/package/libs/udebug/Makefile
@ -11,7 +11,7 @@ PKG_NAME:=udebug
 CMAKE_INSTALL:=1
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/udebug.git
-PKG_MIRROR_HASH:=553a58a14b59dc7b22755557acbc74f0655a431442a4faca56d28cdb1ef14fb4
+PKG_MIRROR_HASH:=62d470ad4a3c4a0138c3102ad2e21dd56e93e9c0c7ec466d591c14e7b8af9a97
 PKG_SOURCE_DATE:=2023-12-06
 PKG_SOURCE_VERSION:=6d3f51f9fda706f0cf4732c762e4dbe8c21e12cf
 PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
--- a/package/libs/ustream-ssl/Makefile
+++ b/package/libs/ustream-ssl/Makefile
@ -7,7 +7,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/ustream-ssl.git
 PKG_SOURCE_DATE:=2023-11-26
 PKG_SOURCE_VERSION:=263b9a97cf7e1e2467319c23832b705fc01190b5
-PKG_MIRROR_HASH:=1c01d633f21c6cb578a785826d1983284b28f49b20d608d82179842dcdbeed6e
+PKG_MIRROR_HASH:=95db3f3a01c65d008a48398c7d5bfbf98cb31eabe291e74a0238220018f0a15b
 CMAKE_INSTALL:=1

 PKG_LICENSE:=ISC
--- a/package/network/config/firewall/Makefile
+++ b/package/network/config/firewall/Makefile
@ -15,7 +15,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/firewall3.git
 PKG_SOURCE_DATE:=2022-02-17
 PKG_SOURCE_VERSION:=4cd7d4f36bea731bf901cb067456f1d460294926
-PKG_MIRROR_HASH:=ce9e8ac1bcf22afbb0a80c3da1a8e8e887851299681097e3dfbfc347f2c4c80f
+PKG_MIRROR_HASH:=66a498164dc89251f34155a679186f090d9f1df104a4a63805f3231d0587e0c9
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=ISC

--- a/package/network/config/firewall4/Makefile
+++ b/package/network/config/firewall4/Makefile
@ -11,7 +11,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/firewall4.git
 PKG_SOURCE_DATE:=2023-11-03
 PKG_SOURCE_VERSION:=698a53354fd280aae097efe08803c0c9a10c14c2
-PKG_MIRROR_HASH:=e38484bffe11a04a67069128aa3b8a8c707ad58c79c0de2785a5d995421457aa
+PKG_MIRROR_HASH:=466c43e46fc4b9c24053874b322b84556e24718c1149bd9a52b889062de0dc29
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=ISC

@ -26,7 +26,7 @@ define Package/firewall4
 	+kmod-nft-nat +kmod-nft-fullcone \
 	+nftables-json \
 	+ucode +ucode-mod-fs +ucode-mod-ubus +ucode-mod-uci
-  EXTRA_DEPENDS:=ucode (>= 2022-03-22)
+  EXTRA_DEPENDS:=ucode (>=2022.03.22)
  PROVIDES:=uci-firewall
 endef

--- a/package/network/config/netifd/Makefile
+++ b/package/network/config/netifd/Makefile
@ -7,7 +7,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
 PKG_SOURCE_DATE:=2024-01-04
 PKG_SOURCE_VERSION:=f01345ec13b9b27ffd314d8689fb2d3f9c81a47d
-PKG_MIRROR_HASH:=58e92e9ce1a2c8ccb487e95dadf806f38b38abbe7cb3cde61ff880de5eb85c2f
+PKG_MIRROR_HASH:=7d1d40d89a8bc20213e0f7a9c1167cdefef250417ec34ca8b4df79b92ba0b5d3
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>

 PKG_LICENSE:=GPL-2.0
--- a/package/network/config/qosify/Makefile
+++ b/package/network/config/qosify/Makefile
@ -13,7 +13,7 @@ PKG_SOURCE_URL=$(PROJECT_GIT)/project/qosify.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2023-03-07
 PKG_SOURCE_VERSION:=9a47ea4b683dd845ec94534fcd82d3117c9ab313
-PKG_MIRROR_HASH:=c4c313aed4a405492201612bdfef5e219c9a994a35f35acc84fc8327d9aa73d2
+PKG_MIRROR_HASH:=0df1dc6e9645691f1ce0c3c039afedbcd8d4635dad36923ce47174e8d5b4ce43
 PKG_RELEASE:=1

 PKG_LICENSE:=GPL-2.0
--- a/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh
+++ b/package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh
@ -273,6 +273,7 @@ mac80211_hostapd_setup_base() {
 				case "$channel" in
 					36|40|44|48|52|56|60|64) idx=50;;
 					100|104|108|112|116|120|124|128) idx=114;;
+					149|153|157|161|165|169|173|177) idx=163;;
 				esac
 			fi
 			enable_ac=1
--- a/package/network/ipv6/odhcp6c/Makefile
+++ b/package/network/ipv6/odhcp6c/Makefile
@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcp6c.git
 PKG_SOURCE_DATE:=2023-05-12
 PKG_SOURCE_VERSION:=bcd283632ac13391aac3ebdd074d1fd832d76fa3
-PKG_MIRROR_HASH:=0f3508a5a148ca831ae30b49b21919535f9dfbbd003a942baa6cb5388d207878
+PKG_MIRROR_HASH:=21aac76fcf4099287868afb52924ed2219e8e846ad82b96b7e1753417a8dde87
 PKG_MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
 PKG_LICENSE:=GPL-2.0

--- a/package/network/services/bridger/Makefile
+++ b/package/network/services/bridger/Makefile
@ -12,7 +12,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=https://github.com/nbd168/bridger
 PKG_SOURCE_DATE:=2023-05-12
 PKG_SOURCE_VERSION:=d0f79a16c749ad310d79e1c31f593860619f99eb
-PKG_MIRROR_HASH:=bee35594767cbcd13764f5c95e4837a4fc73171a91fcdae73aaefe00f4e8f8fa
+PKG_MIRROR_HASH:=052beb648545c67a4e24034347e4cb5d91319147bfe3f8d498d1aa576d14a089

 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@ -11,7 +11,7 @@ PKG_SOURCE_URL:=http://w1.fi/hostap.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2023-09-08
 PKG_SOURCE_VERSION:=e5ccbfc69ecf297590341ae8b461edba9d8e964c
-PKG_MIRROR_HASH:=fcc6550f46c7f8bbdbf71e63f8f699b9a0878565ad1b90a17855f5ec21283b8f
+PKG_MIRROR_HASH:=8be806f6c88e736fff920e0d3e2cde7188fbf640fef47e9aeaad504674bfc0f3

 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=BSD-3-Clause
@ -150,7 +150,7 @@ define Package/hostapd/Default
  TITLE:=IEEE 802.1x Authenticator
  URL:=http://hostap.epitest.fi/
  DEPENDS:=$(DRV_DEPENDS) +hostapd-common $(CORE_DEPENDS)
-  EXTRA_DEPENDS:=hostapd-common (=$(PKG_VERSION)-$(PKG_RELEASE))
+  EXTRA_DEPENDS:=hostapd-common (=$(PKG_VERSION)-r$(PKG_RELEASE))
  USERID:=network=101:network=101
  PROVIDES:=hostapd
  CONFLICTS:=$(HOSTAPD_PROVIDERS)
@ -255,7 +255,7 @@ define Package/wpad/Default
  SUBMENU:=WirelessAPD
  TITLE:=IEEE 802.1x Auth/Supplicant
  DEPENDS:=$(DRV_DEPENDS) +hostapd-common $(CORE_DEPENDS)
-  EXTRA_DEPENDS:=hostapd-common (=$(PKG_VERSION)-$(PKG_RELEASE))
+  EXTRA_DEPENDS:=hostapd-common (=$(PKG_VERSION)-r$(PKG_RELEASE))
  USERID:=network=101:network=101
  URL:=http://hostap.epitest.fi/
  PROVIDES:=hostapd wpa-supplicant
@ -400,7 +400,7 @@ define Package/wpa-supplicant/Default
  TITLE:=WPA Supplicant
  URL:=http://hostap.epitest.fi/wpa_supplicant/
  DEPENDS:=$(DRV_DEPENDS) +hostapd-common $(CORE_DEPENDS)
-  EXTRA_DEPENDS:=hostapd-common (=$(PKG_VERSION)-$(PKG_RELEASE))
+  EXTRA_DEPENDS:=hostapd-common (=$(PKG_VERSION)-r$(PKG_RELEASE))
  USERID:=network=101:network=101
  PROVIDES:=wpa-supplicant
  CONFLICTS:=$(SUPPLICANT_PROVIDERS)
--- a/package/network/services/ipset-dns/Makefile
+++ b/package/network/services/ipset-dns/Makefile
@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://git.zx2c4.com/ipset-dns
 PKG_SOURCE_DATE:=2017-10-08
 PKG_SOURCE_VERSION:=ade2cf88e933f4f90451e0a6171f0aa4a523f989
-PKG_MIRROR_HASH:=34ad1f5c7d2eab90b795f2a512102891428216e3d439d918a8992846550e9697
+PKG_MIRROR_HASH:=3e978df41cf2c79edb13846c458579388b0fae9a547ebca7b9f52ad6c0e50e70
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>

 PKG_LICENSE:=GPL-2.0
--- a/package/network/services/odhcpd/Makefile
+++ b/package/network/services/odhcpd/Makefile
@ -12,7 +12,7 @@ PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcpd.git
-PKG_MIRROR_HASH:=9936331b64880260cf969cc5656e1e1a8b7dc0e0843d64621242c500a330b4d6
+PKG_MIRROR_HASH:=59d04d80175a115d04031291195dcb2ce858301c78bd37f18aeabfa40f750ef8
 PKG_SOURCE_DATE:=2023-10-24
 PKG_SOURCE_VERSION:=d8118f6e76e5519881f9a37137c3a06b3cb60fd2

--- a/package/network/services/omcproxy/Makefile
+++ b/package/network/services/omcproxy/Makefile
@ -12,7 +12,7 @@ PKG_RELEASE:=9

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/omcproxy.git
-PKG_MIRROR_HASH:=6443276368dc7d45ee58bd7067da6c3a85396d9996039232cae3bdd426382f0c
+PKG_MIRROR_HASH:=5e69aa12ca3bc1ecfb211e0ad40e0763a7e9dd99fc8b95b4d62b8c3d29df40bd
 PKG_SOURCE_DATE:=2021-11-04
 PKG_SOURCE_VERSION:=bfba2aa75802ff1a70ef2fd3eba53409a8c6e93a
 PKG_MAINTAINER:=Steven Barth <cyrus@openwrt.org>
--- a/package/network/services/ppp/Makefile
+++ b/package/network/services/ppp/Makefile
@ -15,13 +15,13 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/paulusmack/ppp
 PKG_SOURCE_DATE:=2021-01-04
 PKG_SOURCE_VERSION:=4fb319056f168bb8379865b91b4fd3e1ada73f1e
-PKG_MIRROR_HASH:=429cb5fcff36e1d8698766130711d4764347f08b83233dfb4831bea21616efef
+PKG_MIRROR_HASH:=a6a31f71e46c7170b94e53723515f7d6f8ec512a84aa3003f20d393d8bd97347
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=BSD-4-Clause
 PKG_CPE_ID:=cpe:/a:samba:ppp

 PKG_RELEASE_VERSION:=2.4.9
-PKG_VERSION:=$(PKG_RELEASE_VERSION).git-$(PKG_SOURCE_DATE)
+PKG_VERSION:=$(PKG_RELEASE_VERSION)_git$(subst -,,$(PKG_SOURCE_DATE))

 PKG_BUILD_DEPENDS:=libpcap

--- a/package/network/services/relayd/Makefile
+++ b/package/network/services/relayd/Makefile
@ -14,7 +14,7 @@ PKG_SOURCE_URL=$(PROJECT_GIT)/project/relayd.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2023-01-28
 PKG_SOURCE_VERSION:=f646ba40489371e69f624f2dee2fc4e19ceec00e
-PKG_MIRROR_HASH:=672d3115728d40ee6897a9f633d269d127496699a7bd45eba11844aa771f2501
+PKG_MIRROR_HASH:=19f2627c2e878617df72e31f01bf4505b063e0cb736c1745b176ec416971f923

 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=GPL-2.0
--- a/package/network/services/uhttpd/Makefile
+++ b/package/network/services/uhttpd/Makefile
@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git
 PKG_SOURCE_DATE:=2023-06-25
 PKG_SOURCE_VERSION:=34a8a74dbdec3c0de38abc1b08f6a73c51263792
-PKG_MIRROR_HASH:=8206885eebed5d1827763bcc5bcf9ca3510ae22b0ad1f6432114f1136c32dde2
+PKG_MIRROR_HASH:=28f4b97588d6a991f64ae19a3e8dfed52295f37f543e30010fbeec92b3723c66
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=ISC

--- a/package/network/services/umdns/Makefile
+++ b/package/network/services/umdns/Makefile
@ -14,7 +14,7 @@ PKG_SOURCE_URL=$(PROJECT_GIT)/project/mdnsd.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2024-01-08
 PKG_SOURCE_VERSION:=e91ed406ecebb4bc08c346929e25f1b819c19edd
-PKG_MIRROR_HASH:=6568409c5facaa37dc27aeca67dc798b822c2e2897d6e067b4c61e3e99c1072c
+PKG_MIRROR_HASH:=d5b94ff96dd16d1df3281621c66b3974982d9ee96f52b8400504e9acbc3d9de4

 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=LGPL-2.1
--- a/package/network/services/unetd/Makefile
+++ b/package/network/services/unetd/Makefile
@ -12,7 +12,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/unetd.git
 PKG_SOURCE_DATE:=2023-05-31
 PKG_SOURCE_VERSION:=7d3986b7a5a20b9af0dacd053b2657210385e7bb
-PKG_MIRROR_HASH:=07f0a4cbae3e80c6309bb8aa27fcef19fbc56093a9c7e426e0d527227af09429
+PKG_MIRROR_HASH:=d3db5c71fdeae96782deadb413adf902009a189b7d5f21875d8f4315389849c3

 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
--- a/package/network/services/ustp/Makefile
+++ b/package/network/services/ustp/Makefile
@ -14,7 +14,7 @@ PKG_SOURCE_URL=$(PROJECT_GIT)/project/ustp.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2021-09-21
 PKG_SOURCE_VERSION:=462b3a491347e452c15220861949b1d6371fa59e
-PKG_MIRROR_HASH:=0e96edc983cf437b95874e5715d743f30bb826d8757dc3771ff872ab9cf18f35
+PKG_MIRROR_HASH:=b1d4e96f4855580d20572f930764cb09986339017c2a0ec26b22ce11d511c14f

 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=GPL-2.0
--- a/package/network/utils/ebtables/Makefile
+++ b/package/network/utils/ebtables/Makefile
@ -14,7 +14,7 @@ PKG_RELEASE:=1
 PKG_SOURCE_URL:=https://git.netfilter.org/ebtables
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=48cff25dfea5b37e16ba5dc6601e98ab140f5f99
-PKG_MIRROR_HASH:=1327cdc3402e5e3056819e4e9b6f9d4a5bfd401f2c4f58447afb2c3c73fc8aac
+PKG_MIRROR_HASH:=160f5087b403173d5d1e93880d28b89dab98e828ba3f545315bf1cb88afe5a46

 PKG_LICENSE:=GPL-2.0
 PKG_CPE_ID:=cpe:/a:netfilter:ebtables
--- a/package/network/utils/iwinfo/Makefile
+++ b/package/network/utils/iwinfo/Makefile
@ -11,9 +11,9 @@ PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/iwinfo.git
-PKG_SOURCE_DATE:=2024-03-08
-PKG_SOURCE_VERSION:=8ffb8bfd1115ae95265aa52590aa948aba7672e4
-PKG_MIRROR_HASH:=77bb6018b5001268c0f442dbfd8159893db620c575c9810221b1a42a30be4b5f
+PKG_SOURCE_DATE:=2024-03-23
+PKG_SOURCE_VERSION:=79a96150647110fb03852bc321bd37159d63ae1a
+PKG_MIRROR_HASH:=684ef80f1b85e054016709fc1d90160bd2191e76309831818ace1d4c5ec0f37e
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=GPL-2.0

--- a/package/network/utils/umbim/Makefile
+++ b/package/network/utils/umbim/Makefile
@ -7,7 +7,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/umbim.git
 PKG_SOURCE_DATE:=2022-08-13
 PKG_SOURCE_VERSION:=146bc77c98ace3d1cc672986669650d2e1da71f3
-PKG_MIRROR_HASH:=3cf04858ff5c3f529904f9789b094aa9645ad41c91f553e6fc3fcd3cb341d359
+PKG_MIRROR_HASH:=c610dc08b5663876c2afdc247d4d5615fd1be23e33fa7a646f0237d298719b98
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>

 PKG_LICENSE:=GPL-2.0
--- a/package/network/utils/uqmi/Makefile
+++ b/package/network/utils/uqmi/Makefile
@ -7,7 +7,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/uqmi.git
 PKG_SOURCE_DATE:=2024-01-16
 PKG_SOURCE_VERSION:=c3488b831ce6285c8107704156b9b8ed7d59deb3
-PKG_MIRROR_HASH:=3ca47f2ae22bc1adcb05560e6dbea824063fa914670c13f107e7e78f33399779
+PKG_MIRROR_HASH:=a171d71d471a03e24c45509059db461efcf3cfe0fc19cffec2e8e4fbf99d6eed
 PKG_MAINTAINER:=Matti Laakso <malaakso@elisanet.fi>

 PKG_LICENSE:=GPL-2.0
--- a/package/network/utils/wwan/Makefile
+++ b/package/network/utils/wwan/Makefile
@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=wwan
-PKG_VERSION:=2019-04-29
+PKG_VERSION:=2019.04.29
 PKG_RELEASE=6

 PKG_LICENSE:=GPL-2.0
--- a/package/system/fstools/Makefile
+++ b/package/system/fstools/Makefile
@ -12,7 +12,7 @@ PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git
-PKG_MIRROR_HASH:=32e39891455b602e9deb367c9ce2d099dc72353fad0bf0433307416925f7b393
+PKG_MIRROR_HASH:=ab6978773d2b88eec502f5a217035b059730baf845d90ebb5f1fa52aacf12218
 PKG_SOURCE_DATE:=2024-01-22
 PKG_SOURCE_VERSION:=08cd7083cac4bddf88459efa0881ee52858e7d0a
 CMAKE_INSTALL:=1
--- a/package/system/fwtool/Makefile
+++ b/package/system/fwtool/Makefile
@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/fwtool.git
 PKG_SOURCE_DATE:=2019-11-12
 PKG_SOURCE_VERSION:=8f7fe925ca205c8e8e2d0d1b16218c1e148d5173
-PKG_MIRROR_HASH:=ff68e77397a7ba8f497aae9a6d1f89e196c89391a8d5ed0b81c4eafb889ba744
+PKG_MIRROR_HASH:=f8309d4cf548ce28d98f8f8313d78e17307ded135b96b49bfbc9ac6b039d8689
 CMAKE_INSTALL:=1

 PKG_FLAGS:=nonshared
--- a/package/system/gpio-cdev/nu801/Makefile
+++ b/package/system/gpio-cdev/nu801/Makefile
@ -8,7 +8,7 @@ PKG_RELEASE:=1
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/chunkeey/nu801.git
 PKG_SOURCE_VERSION:=f623879a393d0315f29095fe46b19cd2246d10d7
-PKG_MIRROR_HASH:=db21671a1c14f0bfeb65525cbfd0576d2d5bbebf3901e35e64f9bf92a9a53b0d
+PKG_MIRROR_HASH:=d2080fa74901fcd9c2576784adaa84792b577167576a45326b478192cb157eba
 PKG_MAINTAINER:=Christian Lamparter <chunkeey@gmail.com>
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=LICENSE
--- a/package/system/opkg/Makefile
+++ b/package/system/opkg/Makefile
@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/opkg-lede.git
 PKG_SOURCE_DATE:=2022-02-24
 PKG_SOURCE_VERSION:=d038e5b6d155784575f62a66a8bb7e874173e92e
-PKG_MIRROR_HASH:=e5ec4ae93f6529f7f0b9acc22a9a63c1b2f27d3b30b4a82041fcd58b9bc7cdf3
+PKG_MIRROR_HASH:=6ef0c62ae66ae77c51513b42b685908b709cf7e1c897289a36b3f6d5612b1462

 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@ -12,7 +12,7 @@ PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
-PKG_MIRROR_HASH:=fc7ea415ebb1946661c1204a16b2a2b129014d39521da5883524e5ced8c3c9b4
+PKG_MIRROR_HASH:=90dc0593b8db32e8645e82cc36f18438ccd2103d56fae68c44320f7633aa0eec
 PKG_SOURCE_DATE:=2024-02-24
 PKG_SOURCE_VERSION:=1901aba90b6841ec1a99a25224a92d2519c603fd
 CMAKE_INSTALL:=1
--- a/package/system/rpcd/Makefile
+++ b/package/system/rpcd/Makefile
@ -12,7 +12,7 @@ PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/rpcd.git
-PKG_MIRROR_HASH:=cf77c8aca75f893315620e2e3abf7fa02d8c8a21f54808b238973e43c66d0059
+PKG_MIRROR_HASH:=69ba17315cfaa2736e1d2c4da03624f42dcff25cc3c8422cbb0e5f7d2729f4ae
 PKG_SOURCE_DATE:=2024-02-22
 PKG_SOURCE_VERSION:=8ef4c2587ac0041049c67befed281a70cf240769
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
--- a/package/system/ubox/Makefile
+++ b/package/system/ubox/Makefile
@ -7,7 +7,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubox.git
 PKG_SOURCE_DATE:=2024-01-24
 PKG_SOURCE_VERSION:=2c5887cb46883a28d69071c4349c3dabbbe3972c
-PKG_MIRROR_HASH:=0ded95382fd3a2e9751ea5fdd16c2afb7dcc52499f6ab47951c5db9525a4faa9
+PKG_MIRROR_HASH:=3194d80bc10147a32d7e4491c54d1a4e718a53080fa0307fe68b6d11cf79e13e
 CMAKE_INSTALL:=1

 PKG_LICENSE:=GPL-2.0
--- a/package/system/ubus/Makefile
+++ b/package/system/ubus/Makefile
@ -7,7 +7,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubus.git
 PKG_SOURCE_DATE:=2023-11-28
 PKG_SOURCE_VERSION:=f84eb5998c6ea2d34989ca2d3254e56c66139313
-PKG_MIRROR_HASH:=d0c15a0275fa3d35accddb84611700bf601745ad68462bc18905bb65da931f21
+PKG_MIRROR_HASH:=75f39a88a6b019ae95c73ed3f7373e5197aa1ff29dc9a95ea46483412f4051ae
 PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
 CMAKE_INSTALL:=1

--- a/package/system/ucert/Makefile
+++ b/package/system/ucert/Makefile
@ -7,7 +7,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/ucert.git
 PKG_SOURCE_DATE:=2020-05-24
 PKG_SOURCE_VERSION:=00b921d80ac0dc47339305d803f865ff43c56d63
-PKG_MIRROR_HASH:=839fda1811a58a495ac7bbc41db75222dd5a15e4d72110ca6acc4cdad56908fe
+PKG_MIRROR_HASH:=e6e9024777c36c43a8aa5f0f91927d822d1e08943adfee9bc0a34d86a00dde4c

 CMAKE_INSTALL:=1
 PKG_CHECK_FORMAT_SECURITY:=1
--- a/package/system/uci/Makefile
+++ b/package/system/uci/Makefile
@ -15,7 +15,7 @@ PKG_SOURCE_URL=$(PROJECT_GIT)/project/uci.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2023-08-10
 PKG_SOURCE_VERSION:=5781664d5087ccc4b5ab58505883231212dbedbc
-PKG_MIRROR_HASH:=2d60a8543fa00cfc75df6417354b004abf58f672c91bf0a3bffe3ea1dbf84a4b
+PKG_MIRROR_HASH:=18169cbabe76e8b3f5989a031c05e353a57708633e522605ea0f11dcbb3fa441

 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=
--- a/package/system/urngd/Makefile
+++ b/package/system/urngd/Makefile
@ -7,7 +7,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/urngd.git
 PKG_SOURCE_DATE:=2023-11-01
 PKG_SOURCE_VERSION:=44365eb1e1165f2a44cb31f404b04cf85031718e
-PKG_MIRROR_HASH:=743bdfacf1f1e779047a55fe8f388aaf31f6e55e8a4d0a00fcabffb68af2202e
+PKG_MIRROR_HASH:=07055a10fe6f45e07bb8e06245e3231f316ac0c9efb0f86a0f6630b8ac640b38

 PKG_LICENSE:=GPL-2.0 BSD-3-Clause
 PKG_LICENSE_FILES:=
--- a/package/system/usign/Makefile
+++ b/package/system/usign/Makefile
@ -7,7 +7,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/usign.git
 PKG_SOURCE_DATE:=2020-05-23
 PKG_SOURCE_VERSION:=f1f65026a94137c91b5466b149ef3ea3f20091e9
-PKG_MIRROR_HASH:=3f6569a5e63fdfd032976ac0f79d736d3935101ac1b97fb370514b013c5e6bb6
+PKG_MIRROR_HASH:=e5c047bf0fdb2d790a60fcfe460c414be8bea84863fa4503c65d95d2ee4bf5ee
 CMAKE_INSTALL:=1
 PKG_CHECK_FORMAT_SECURITY:=1
 PKG_BUILD_FLAGS:=no-mips16 lto
--- a/package/utils/firmware-utils/Makefile
+++ b/package/utils/firmware-utils/Makefile
@ -7,9 +7,9 @@ PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/firmware-utils.git
-PKG_SOURCE_DATE:=2023-11-22
-PKG_SOURCE_VERSION:=d87b6c4b6423201e595459840f51d0dced04a4eb
-PKG_MIRROR_HASH:=f34fbf4dc4bd13d18ea94e6e25090b57cde11b3dc7133e46f6ce3bb9164ab8fb
+PKG_SOURCE_DATE:=2024-03-23
+PKG_SOURCE_VERSION:=6b242991a995c41769977efb010dc9f4e4ec3da2
+PKG_MIRROR_HASH:=f8d84868487ec51ea4119fb5a48a181025ca272d8eb5b714068d0eec8db88d87

 PKG_BUILD_DEPENDS:=openssl zlib

--- a/package/utils/jsonfilter/Makefile
+++ b/package/utils/jsonfilter/Makefile
@ -7,7 +7,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/jsonpath.git
 PKG_SOURCE_DATE:=2024-01-23
 PKG_SOURCE_VERSION:=594cfa86469c005972ba750614f5b3f1af84d0f6
-PKG_MIRROR_HASH:=70d2e0870b746920af4569631218c38c1dddfee4f5d029ec8ea0a67999bdafcd
+PKG_MIRROR_HASH:=92bb2bc64be6769bd16c2c3c0e955e8f58abd6b99ffe6841d089e08df78fc8b7
 CMAKE_INSTALL:=1

 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
--- a/package/utils/ravpower-mcu/Makefile
+++ b/package/utils/ravpower-mcu/Makefile
@ -5,7 +5,7 @@ PKG_RELEASE:=2

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=https://github.com/blocktrron/ravpower-mcu.git
-PKG_MIRROR_HASH:=edde0fda3fc708eac65baff46b5b6f1290ab733d3f4bd7fc027ef45c3d1b5814
+PKG_MIRROR_HASH:=b018291629782d46cd5e3aae59c18598f83d2bae2edd1e356b88d296be07a48a
 PKG_SOURCE_DATE:=2020-06-19
 PKG_SOURCE_VERSION:=1665d9e9212dcd118629a74fbe658841f81036f7
 PKG_MAINTAINER:=David Bauer <mail@david-bauer.net>
--- a/package/utils/ucode/Makefile
+++ b/package/utils/ucode/Makefile
@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=https://github.com/jow-/ucode.git
 PKG_SOURCE_DATE:=2024-02-21
 PKG_SOURCE_VERSION:=ba3855ae3775197f3594fc2615cac539075bd2fb
-PKG_MIRROR_HASH:=82b8a73417575b58a234586354eba4d0b10180a80b441cd87a9a554227304d34
+PKG_MIRROR_HASH:=8c52f1a03729653640a8184dbb97c22fde9619ee3a29b6ebdd76a16fae3e60ef
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=ISC

--- a/package/utils/ugps/Makefile
+++ b/package/utils/ugps/Makefile
@ -14,7 +14,7 @@ PKG_SOURCE_URL=$(PROJECT_GIT)/project/ugps.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2024-02-14
 PKG_SOURCE_VERSION:=69561a074d6f50f63b82608b19041e5eb2c605a9
-PKG_MIRROR_HASH:=6a9ea235665babc22393df53e6945030a2e2264d92afccf2e9cd61fa01aa3b11
+PKG_MIRROR_HASH:=ed85dfc8eb34b2c4ffdfd817f851bcef48f46983e5a3b7212003df418c217493

 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=GPL-2.0+
--- a/package/utils/usbmode/Makefile
+++ b/package/utils/usbmode/Makefile
@ -7,7 +7,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/usbmode.git
 PKG_SOURCE_DATE:=2022-02-24
 PKG_SOURCE_VERSION:=3c8595a4e75510f58fa231b145d5506768dcafc9
-PKG_MIRROR_HASH:=5f0234945f61639080f039522172151452180dd4aec33bafc8a61b60131c3bed
+PKG_MIRROR_HASH:=dfa2cd90d5bea5f7382157f6396da8a79a7b38d25f65bacfdb682729ac257cf4
 CMAKE_INSTALL:=1

 PKG_LICENSE:=GPL-2.0
--- a/target/linux/airoha/config-5.15
+++ b/target/linux/airoha/config-5.15
@ -122,7 +122,8 @@ CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_EN7523=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
+# CONFIG_HARDEN_BRANCH_HISTORY is not set
+# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
--- a/target/linux/airoha/config-6.1
+++ b/target/linux/airoha/config-6.1
@ -133,7 +133,8 @@ CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_EN7523=y
 CONFIG_GPIO_GENERIC=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
+# CONFIG_HARDEN_BRANCH_HISTORY is not set
+# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
--- a/target/linux/apm821xx/base-files/etc/init.d/hwmon_fancontrol
+++ b/target/linux/apm821xx/base-files/etc/init.d/hwmon_fancontrol
@ -9,7 +9,7 @@ boot() {
 	case $(board_name) in
 	netgear,wndr4700)
 		path_to_hwmon='/sys/devices/platform/plb/plb:opb/4ef600700.i2c/i2c-0/0-001b/hwmon/hwmon1'
-		echo 1 > "$path_to_hwmon/pwm1_enable"
+		echo 1 > "$path_to_hwmon/pwm1_mode"
 		;;
 	esac
 }
--- a/target/linux/at91/sama5/config-5.15
+++ b/target/linux/at91/sama5/config-5.15
@ -192,7 +192,8 @@ CONFIG_GLOB=y
 CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_CDEV=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
+# CONFIG_HARDEN_BRANCH_HISTORY is not set
+# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
--- a/target/linux/at91/sama7/config-5.15
+++ b/target/linux/at91/sama7/config-5.15
@ -181,7 +181,8 @@ CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GRACE_PERIOD=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
+# CONFIG_HARDEN_BRANCH_HISTORY is not set
+# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
--- a/target/linux/bcm27xx/bcm2709/config-6.1
+++ b/target/linux/bcm27xx/bcm2709/config-6.1
@ -241,7 +241,8 @@ CONFIG_GPIO_BCM_VIRT=y
 CONFIG_GPIO_CDEV=y
 # CONFIG_GPIO_FSM is not set
 CONFIG_GPIO_RASPBERRYPI_EXP=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
+# CONFIG_HARDEN_BRANCH_HISTORY is not set
+# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
--- a/target/linux/bcm27xx/bcm2710/config-6.1
+++ b/target/linux/bcm27xx/bcm2710/config-6.1
@ -303,6 +303,7 @@ CONFIG_MFD_CORE=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MICROCHIP_PHY=y
 CONFIG_MIGRATION=y
+# CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set
 CONFIG_MMC=y
 # CONFIG_MMC_BCM2835 is not set
 CONFIG_MMC_BCM2835_DMA=y
--- a/target/linux/bcm4908/config-5.15
+++ b/target/linux/bcm4908/config-5.15
@ -135,6 +135,7 @@ CONFIG_MDIO_DEVRES=y
 CONFIG_MEMFD_CREATE=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MIGRATION=y
+# CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_MTD_BRCM_U_BOOT=y
 CONFIG_MTD_CMDLINE_PARTS=y
--- a/target/linux/bcm4908/config-6.1
+++ b/target/linux/bcm4908/config-6.1
@ -136,6 +136,7 @@ CONFIG_MDIO_DEVRES=y
 CONFIG_MEMFD_CREATE=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MIGRATION=y
+# CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_MTD_BRCM_U_BOOT=y
 CONFIG_MTD_CMDLINE_PARTS=y
--- a/target/linux/generic/config-6.1
+++ b/target/linux/generic/config-6.1
@ -5324,6 +5324,9 @@ CONFIG_RFKILL=y
 # CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
+# CONFIG_RISCV_PMU is not set
+# CONFIG_RISCV_PMU_LEGACY is not set
+# CONFIG_RISCV_PMU_SBI is not set
 # CONFIG_RMI4_CORE is not set
 # CONFIG_RMNET is not set
 # CONFIG_ROCKCHIP_PHY is not set
--- a/target/linux/generic/config-6.6
+++ b/target/linux/generic/config-6.6
@ -5447,6 +5447,9 @@ CONFIG_RFKILL=y
 # CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
 # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
+# CONFIG_RISCV_PMU is not set
+# CONFIG_RISCV_PMU_LEGACY is not set
+# CONFIG_RISCV_PMU_SBI is not set
 # CONFIG_RMI4_CORE is not set
 # CONFIG_RMNET is not set
 # CONFIG_ROCKCHIP_ERRATUM_3588001 is not set
--- a/target/linux/generic/hack-6.1/650-netfilter-add-xt_FLOWOFFLOAD-target.patch
+++ b/target/linux/generic/hack-6.1/650-netfilter-add-xt_FLOWOFFLOAD-target.patch
@ -8,7 +8,15 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -1023,6 +1023,15 @@ config NETFILTER_XT_TARGET_NOTRACK
+@@ -726,7 +726,6 @@ config NF_FLOW_TABLE
+ 	tristate "Netfilter flow table module"
+ 	depends on NETFILTER_INGRESS
+ 	depends on NF_CONNTRACK
+-	depends on NF_TABLES
+ 	help
+ 	  This option adds the flow table core infrastructure.
+ 
+@@ -1023,6 +1022,15 @@ config NETFILTER_XT_TARGET_NOTRACK
 	depends on NETFILTER_ADVANCED
 	select NETFILTER_XT_TARGET_CT
 
--- a/target/linux/generic/hack-6.6/650-netfilter-add-xt_FLOWOFFLOAD-target.patch
+++ b/target/linux/generic/hack-6.6/650-netfilter-add-xt_FLOWOFFLOAD-target.patch
@ -8,7 +8,15 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>

 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -1025,6 +1025,15 @@ config NETFILTER_XT_TARGET_NOTRACK
+@@ -729,7 +729,6 @@ config NF_FLOW_TABLE
+ 	tristate "Netfilter flow table module"
+ 	depends on NETFILTER_INGRESS
+ 	depends on NF_CONNTRACK
+-	depends on NF_TABLES
+ 	help
+ 	  This option adds the flow table core infrastructure.
+ 
+@@ -1025,6 +1024,15 @@ config NETFILTER_XT_TARGET_NOTRACK
 	depends on NETFILTER_ADVANCED
 	select NETFILTER_XT_TARGET_CT
 
--- a/target/linux/imx/cortexa7/config-default
+++ b/target/linux/imx/cortexa7/config-default
@ -53,6 +53,8 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+# CONFIG_HARDEN_BRANCH_HISTORY is not set
+# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
 CONFIG_HDMI=y
 CONFIG_HW_CONSOLE=y
 CONFIG_HW_RANDOM_IMX_RNGC=y
--- a/target/linux/ipq40xx/config-6.1
+++ b/target/linux/ipq40xx/config-6.1
@ -199,7 +199,8 @@ CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_WATCHDOG=y
 CONFIG_GPIO_WATCHDOG_ARCH_INITCALL=y
 CONFIG_GRO_CELLS=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
+# CONFIG_HARDEN_BRANCH_HISTORY is not set
+# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
--- a/target/linux/layerscape/armv7/config-6.1
+++ b/target/linux/layerscape/armv7/config-6.1
@ -274,7 +274,8 @@ CONFIG_GPIO_GENERIC_PLATFORM=y
 CONFIG_GPIO_MPC8XXX=y
 CONFIG_GPIO_MXC=y
 CONFIG_GPIO_VF610=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
+# CONFIG_HARDEN_BRANCH_HISTORY is not set
+# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
--- a/target/linux/mediatek/filogic/config-6.1
+++ b/target/linux/mediatek/filogic/config-6.1
@ -232,6 +232,7 @@ CONFIG_MEMFD_CREATE=y
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=7
 CONFIG_MFD_SYSCON=y
 CONFIG_MIGRATION=y
+# CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_CQHCI=y
--- a/target/linux/mediatek/filogic/config-6.6
+++ b/target/linux/mediatek/filogic/config-6.6
@ -245,6 +245,7 @@ CONFIG_MEDIATEK_WATCHDOG=y
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=7
 CONFIG_MFD_SYSCON=y
 CONFIG_MIGRATION=y
+# CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_CQHCI=y
--- a/target/linux/mediatek/mt7622/config-6.1
+++ b/target/linux/mediatek/mt7622/config-6.1
@ -235,6 +235,7 @@ CONFIG_MEMFD_CREATE=y
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=7
 CONFIG_MFD_SYSCON=y
 CONFIG_MIGRATION=y
+# CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_CQHCI=y
--- a/target/linux/mediatek/mt7622/config-6.6
+++ b/target/linux/mediatek/mt7622/config-6.6
@ -248,6 +248,7 @@ CONFIG_MEDIATEK_WATCHDOG=y
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=7
 CONFIG_MFD_SYSCON=y
 CONFIG_MIGRATION=y
+# CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_CQHCI=y
--- a/target/linux/mediatek/mt7623/config-6.1
+++ b/target/linux/mediatek/mt7623/config-6.1
@ -263,7 +263,8 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_VDSO_32=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GRO_CELLS=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
+# CONFIG_HARDEN_BRANCH_HISTORY is not set
+# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
--- a/target/linux/mediatek/mt7623/config-6.6
+++ b/target/linux/mediatek/mt7623/config-6.6
@ -270,6 +270,8 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_VDSO_32=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GRO_CELLS=y
+# CONFIG_HARDEN_BRANCH_HISTORY is not set
+# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
--- a/target/linux/mediatek/mt7629/config-6.1
+++ b/target/linux/mediatek/mt7629/config-6.1
@ -147,7 +147,8 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_VDSO_32=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GRO_CELLS=y
-CONFIG_HARDEN_BRANCH_PREDICTOR=y
+# CONFIG_HARDEN_BRANCH_HISTORY is not set
+# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
--- a/target/linux/mediatek/mt7629/config-6.6
+++ b/target/linux/mediatek/mt7629/config-6.6
@ -145,6 +145,8 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_VDSO_32=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GRO_CELLS=y
+# CONFIG_HARDEN_BRANCH_HISTORY is not set
+# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
--- a/target/linux/mvebu/cortexa53/config-6.1
+++ b/target/linux/mvebu/cortexa53/config-6.1
@ -52,6 +52,7 @@ CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_MAILBOX=y
 # CONFIG_MAILBOX_TEST is not set
 CONFIG_MFD_SYSCON=y
+# CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set
 CONFIG_MMC_SDHCI_XENON=y
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_MVEBU_GICP=y
--- a/target/linux/qualcommax/config-6.1
+++ b/target/linux/qualcommax/config-6.1
@ -227,6 +227,7 @@ CONFIG_MEMFD_CREATE=y
 # CONFIG_MFD_QCOM_RPM is not set
 CONFIG_MFD_SYSCON=y
 CONFIG_MIGRATION=y
+# CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=32
--- a/target/linux/qualcommax/config-6.6
+++ b/target/linux/qualcommax/config-6.6
@ -230,6 +230,7 @@ CONFIG_MDIO_IPQ4019=y
 # CONFIG_MFD_QCOM_RPM is not set
 CONFIG_MFD_SYSCON=y
 CONFIG_MIGRATION=y
+# CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=32
--- a/target/linux/ramips/dts/mt7628an_tplink_re205-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_re205-v3.dts
@ -0,0 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "mt7628an_tplink_re200.dtsi"
+
+/ {
+	compatible = "tplink,re205-v3", "mediatek,mt7628an-soc";
+	model = "TP-Link RE205 v3";
+
+	/delete-node/ leds;
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_power: power {
+			function = LED_FUNCTION_POWER;
+			color = <LED_COLOR_ID_BLUE>;
+			gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
+		};
+
+		wifi5g {
+			function = LED_FUNCTION_WLAN_5GHZ;
+			color = <LED_COLOR_ID_BLUE>;
+			gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy1tpt";
+		};
+
+		wifi2g {
+			function = LED_FUNCTION_WLAN_2GHZ;
+			color = <LED_COLOR_ID_BLUE>;
+			gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy0tpt";
+		};
+
+		signal_blue {
+			label = "blue:signal";
+			gpios = <&gpio 42 GPIO_ACTIVE_LOW>;
+		};
+
+		signal_red {
+			label = "red:signal";
+			gpios = <&gpio 43 GPIO_ACTIVE_LOW>;
+		};
+	};
+};
--- a/target/linux/ramips/image/mt76x8.mk
+++ b/target/linux/ramips/image/mt76x8.mk
@ -640,6 +640,16 @@ define Device/tplink_re200-v4
 endef
 TARGET_DEVICES += tplink_re200-v4

+define Device/tplink_re205-v3
+  $(Device/tplink-safeloader)
+  IMAGE_SIZE := 7808k
+  DEVICE_MODEL := RE205
+  DEVICE_VARIANT := v3
+  DEVICE_PACKAGES := kmod-mt76x0e
+  TPLINK_BOARD_ID := RE205-V3
+endef
+TARGET_DEVICES += tplink_re205-v3
+
 define Device/tplink_re220-v2
  $(Device/tplink-safeloader)
  IMAGE_SIZE := 7808k
--- a/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds
@ -91,6 +91,9 @@ tplink,tl-mr3020-v3|\
 tplink,tl-wa801nd-v5)
 	ucidef_set_led_netdev "lan" "lan" "green:lan" "eth0"
 	;;
+tplink,re205-v3)
+	ucidef_set_led_netdev "lan" "lan" "blue:signal" "eth0"
+	;;
 tplink,re365-v1)
 	ucidef_set_led_netdev "lan" "lan" "blue:lan" "eth0"
 	;;
--- a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
@ -24,6 +24,7 @@ ramips_setup_interfaces()
 	tplink,re200-v2|\
 	tplink,re200-v3|\
 	tplink,re200-v4|\
+	tplink,re205-v3|\
 	tplink,re220-v2|\
 	tplink,re305-v1|\
 	tplink,re305-v3|\
--- a/target/linux/realtek/dts-5.15/rtl8382_d-link_dgs-1210-16.dts
+++ b/target/linux/realtek/dts-5.15/rtl8382_d-link_dgs-1210-16.dts
@ -2,6 +2,7 @@

 #include "rtl838x.dtsi"
 #include "rtl83xx_d-link_dgs-1210_common.dtsi"
+#include "rtl83xx_d-link_dgs-1210_gpio.dtsi"

 / {
 	compatible = "d-link,dgs-1210-16", "realtek,rtl838x-soc";
--- a/target/linux/sunxi/cortexa53/config-6.1
+++ b/target/linux/sunxi/cortexa53/config-6.1
@ -61,6 +61,7 @@ CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_MDIO_BUS_MUX=y
 CONFIG_MICREL_PHY=y
+# CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_MOTORCOMM_PHY=y
 CONFIG_MUSB_PIO_ONLY=y
--- a/target/linux/sunxi/cortexa7/config-6.1
+++ b/target/linux/sunxi/cortexa7/config-6.1
@ -6,6 +6,8 @@ CONFIG_CRYPTO_BLAKE2S_ARM=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_DWMAC_SUN8I=y
 CONFIG_GRO_CELLS=y
+# CONFIG_HARDEN_BRANCH_HISTORY is not set
+# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
 # CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
 # CONFIG_MACH_SUN4I is not set
 # CONFIG_MACH_SUN5I is not set
--- a/target/linux/uml/Makefile
+++ b/target/linux/uml/Makefile
@ -13,8 +13,8 @@ BOARD:=uml
 BOARDNAME:=User Mode Linux
 FEATURES:=audio ext4 rootfs-part squashfs

-KERNEL_PATCHVER:=5.15
-KERNEL_TESTING_PATCHVER:=6.1
+KERNEL_PATCHVER:=6.1
+KERNEL_TESTING_PATCHVER:=6.6

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/uml/config-5.15
+++ b/target/linux/uml/config-5.15
@ -1,7 +1,6 @@
 CONFIG_3_LEVEL_PGTABLES=y
 CONFIG_64BIT=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_ARCH_EPHEMERAL_INODES=y
 CONFIG_ARCH_NO_PREEMPT=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_BLK_DEV_COW_COMMON=y
@ -9,8 +8,10 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_UBD=y
 CONFIG_BLK_DEV_UBD_SYNC=y
 CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BUFFER_HEAD=y
 CONFIG_CDROM=y
 # CONFIG_COMMON_CLK is not set
+CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
 # CONFIG_COMPAT_32BIT_TIME is not set
 CONFIG_CON_CHAN="xterm"
 CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
@ -23,26 +24,30 @@ CONFIG_CRC16=y
 CONFIG_CRYPTO_CRC32=y
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_GF128MUL=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
-CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_LIB_SHA1=y
+CONFIG_CRYPTO_LIB_UTILS=y
 CONFIG_CRYPTO_SHA1=y
-# CONFIG_CRYPTO_TWOFISH_X86_64 is not set
-CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DNOTIFY=y
 # CONFIG_EARLY_PRINTK is not set
+CONFIG_EXCLUSIVE_SYSTEM_RAM=y
 CONFIG_EXT4_FS=y
 CONFIG_F2FS_FS=y
 CONFIG_FAILOVER=y
 CONFIG_FS_IOMAP=y
 CONFIG_FS_MBCACHE=y
+CONFIG_FUNCTION_ALIGNMENT=0
 CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_FW_LOADER_SYSFS=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 # CONFIG_GENERIC_CPU is not set
 CONFIG_GENERIC_CPU_DEVICES=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GPIO_CDEV=y
 CONFIG_HOSTFS=y
 CONFIG_HVC_DRIVER=y
 CONFIG_HW_RANDOM=y
@ -61,16 +66,19 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 CONFIG_MAY_HAVE_RUNTIME_DEPS=y
 CONFIG_MCONSOLE=y
 # CONFIG_MCORE2 is not set
-CONFIG_MEMFD_CREATE=y
 CONFIG_MIGRATION=y
 CONFIG_MK8=y
 # CONFIG_MMAPPER is not set
+CONFIG_MMU_LAZY_TLB_REFCOUNT=y
 CONFIG_MODULES_USE_ELF_RELA=y
 # CONFIG_MPSC is not set
 CONFIG_NAMESPACES=y
 CONFIG_NEED_PER_CPU_KM=y
+CONFIG_NET_EGRESS=y
 CONFIG_NET_FAILOVER=y
+CONFIG_NET_INGRESS=y
 # CONFIG_NET_NS is not set
+CONFIG_NET_XGRESS=y
 CONFIG_NLS=y
 CONFIG_NO_DMA=y
 CONFIG_NO_IOMEM=y
@ -78,31 +86,39 @@ CONFIG_NO_IOPORT_MAP=y
 CONFIG_NR_CPUS=1
 CONFIG_NULL_CHAN=y
 # CONFIG_OF is not set
+CONFIG_PAGE_POOL=y
+CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
+CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
+CONFIG_PAHOLE_HAS_LANG_EXCLUDE=y
 CONFIG_PGTABLE_LEVELS=3
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PORT_CHAN=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_PREEMPT_NONE_BUILD=y
 # CONFIG_PROCESSOR_SELECT is not set
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_PTP_1588_CLOCK_OPTIONAL=y
 CONFIG_PTY_CHAN=y
+CONFIG_RANDSTRUCT_NONE=y
 CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
 CONFIG_RELAY=y
 CONFIG_SG_POOL=y
 CONFIG_SOFT_WATCHDOG=m
-CONFIG_SRCU=y
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
 CONFIG_SSL=y
 CONFIG_SSL_CHAN="pty"
 CONFIG_STACKTRACE=y
 CONFIG_STDERR_CONSOLE=y
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TINY_SRCU=y
+CONFIG_TOOLS_SUPPORT_RELR=y
 CONFIG_TTY_CHAN=y
 CONFIG_UML=y
 CONFIG_UML_NET=y
 CONFIG_UML_NET_DAEMON=y
+CONFIG_UML_NET_DAEMON_DEFAULT_SOCK="/tmp/uml.ctl"
 CONFIG_UML_NET_DETERMINISTIC_MAC=y
 CONFIG_UML_NET_ETHERTAP=y
 CONFIG_UML_NET_MCAST=y
@ -114,12 +130,12 @@ CONFIG_UML_NET_TUNTAP=y
 CONFIG_UML_NET_VECTOR=y
 # CONFIG_UML_PCI_OVER_VIRTIO is not set
 CONFIG_UML_RANDOM=y
-# CONFIG_UML_SOUND is not set
 CONFIG_UML_TIME_TRAVEL_SUPPORT=y
-CONFIG_UML_WATCHDOG=y
+# CONFIG_UML_WATCHDOG is not set
 CONFIG_UML_X86=y
 # CONFIG_USER_NS is not set
 CONFIG_VIRTIO=y
+CONFIG_VIRTIO_ANCHOR=y
 CONFIG_VIRTIO_BLK=y
 CONFIG_VIRTIO_CONSOLE=y
 CONFIG_VIRTIO_NET=y
@ -136,5 +152,7 @@ CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_MINIMUM_CPU_FAMILY=64
 CONFIG_X86_TSC=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_VMX_FEATURE_NAMES=y
 CONFIG_XTERM_CHAN=y
+CONFIG_XTERM_CHAN_DEFAULT_EMULATOR="xterm"
 CONFIG_ZLIB_INFLATE=y
--- a/target/linux/uml/patches-5.15/104-um-increase-default-virtual-physical-memory-to-64.patch
+++ b/target/linux/uml/patches-5.15/104-um-increase-default-virtual-physical-memory-to-64.patch
@ -1,40 +0,0 @@
-From d7936f11aded13f03871c0d6502d611d6a1e2dc5 Mon Sep 17 00:00:00 2001
-Message-Id: <d7936f11aded13f03871c0d6502d611d6a1e2dc5.1659815468.git.chunkeey@gmail.com>
-In-Reply-To: <53b5c5f559cc95fc676cb4cc9e5a8d9f0cb8f58c.1659815468.git.chunkeey@gmail.com>
-References: <53b5c5f559cc95fc676cb4cc9e5a8d9f0cb8f58c.1659815468.git.chunkeey@gmail.com>
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Sat, 6 Aug 2022 19:27:20 +0200
-Subject: [PATCH v1 2/2] um: increase default virtual physical memory to 64 MiB
-To: linux-um@lists.infradead.org
-Cc: Richard Weinberger <richard@nod.at>,
-    Anton Ivanov <anton.ivanov@cambridgegreys.com>,
-    Johannes Berg <johannes@sipsolutions.net>
-
-The current 32 MiB of RAM causes OOMs to appear shortly after
-booting in a minimal OpenWrt 22.03 configuration with a
-5.10.134 kernel.
-
-Of course, passing a "mem=64M" (from the --help text) parameter
-works too, but it produces the following (info) message:
-
-| [    0.000000] Unknown kernel command line parameters "mem=64M", will be passed to user space.
-
-That's why, I think it would be nicer, if this is working out
-of the box again :).
-
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
---
- arch/um/kernel/um_arch.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
--- a/arch/um/kernel/um_arch.c
-+++ b/arch/um/kernel/um_arch.c
-@@ -131,7 +131,7 @@ static int have_root __initdata;
- static int have_console __initdata;
- 
- /* Set in uml_mem_setup and modified in linux_main */
-long long physmem_size = 32 * 1024 * 1024;
-+long long physmem_size = 64 * 1024 * 1024;
- EXPORT_SYMBOL(physmem_size);
- 
- static const char *usage_string =
--- a/target/linux/uml/patches-5.15/101-mconsole-exec.patch
+++ b/target/linux/uml/patches-5.15/101-mconsole-exec.patch
@ -143,7 +143,7 @@
 #endif /* __LINUX_KMOD_H__ */
 --- a/include/linux/umh.h
 +++ b/include/linux/umh.h
-@@ -22,6 +22,7 @@ struct subprocess_info {
+@@ -23,6 +23,7 @@ struct subprocess_info {
 	const char *path;
 	char **argv;
 	char **envp;
@ -153,15 +153,15 @@
 	int (*init)(struct subprocess_info *info, struct cred *new);
 --- a/kernel/umh.c
 +++ b/kernel/umh.c
-@@ -28,6 +28,7 @@
- #include <linux/async.h>
+@@ -29,6 +29,7 @@
 #include <linux/uaccess.h>
 #include <linux/initrd.h>
+ #include <linux/freezer.h>
 +#include <linux/pipe_fs_i.h>
 
 #include <trace/events/module.h>
 
-@@ -73,6 +74,28 @@ static int call_usermodehelper_exec_asyn
+@@ -71,6 +72,28 @@ static int call_usermodehelper_exec_asyn
 	flush_signal_handlers(current, 1);
 	spin_unlock_irq(&current->sighand->siglock);
 
@ -190,7 +190,7 @@
 	/*
 	 * Initial kernel threads share ther FS with init, in order to
 	 * get the init root directory. But we've now created a new
-@@ -332,6 +355,20 @@ static void helper_unlock(void)
+@@ -330,6 +353,20 @@ static void helper_unlock(void)
 		wake_up(&running_helpers_waitq);
 }
 
--- a/Show More
+++ b/Show More