patches/: re-order and fold patches

Signed-off-by: John Crispin <john@phrozen.org>

patches/0001-pending-scripts-add-gen_config.py.patch

@@ -1,7 +1,7 @@
-From 9a11ccbc33db5068b1f567c3f7e45533c63c8b9a Mon Sep 17 00:00:00 2001
+From a1210770e920e2e327d5b5e260515a711b61c8f7 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 19 Jun 2020 10:45:22 +0200
-Subject: [PATCH 01/43] pending: scripts: add gen_config.py
+Subject: [PATCH 01/68] pending: scripts: add gen_config.py
 
 This script is used to setup the tree based on the profiles/.
 
@@ -13,7 +13,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 
 diff --git a/scripts/gen_config.py b/scripts/gen_config.py
 new file mode 100755
-index 0000000000..610d5b517a
+index 0000000000..711015d119
 --- /dev/null
 +++ b/scripts/gen_config.py
 @@ -0,0 +1,233 @@

patches/0002-scripts-update-feed-script.patch

@@ -1,7 +1,7 @@
-From d314f454cd4e7c4eec66c155d348eb6e421eb2fd Mon Sep 17 00:00:00 2001
+From 530da58d4c40613ce281db5ba39f5fcfa9587825 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 19 Jun 2020 13:25:27 +0200
-Subject: [PATCH 02/43] scripts: update feed script
+Subject: [PATCH 02/68] scripts: update feed script
 
 gen_config.py requires the latest version of the feeds script.
 

patches/0003-scripts-ubinize-image.sh-allow-setting-the-rootfs-na.patch

@@ -1,7 +1,7 @@
-From 8b71b30bb2bb5c6a98ae16b358887826246c444a Mon Sep 17 00:00:00 2001
+From ac27aa3b4cc92e91a76c3bb34ed0616e8e3cdf57 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 15 Jul 2023 10:44:03 +0200
-Subject: [PATCH 03/43] scripts/ubinize-image.sh: allow setting the rootfs name
+Subject: [PATCH 03/68] scripts/ubinize-image.sh: allow setting the rootfs name
 
 This patch allows us to use a different rootfs name. Some QCA boards will
 require the in ubi rfs to be called ubi_rootfs.

patches/0004-include-image-commands.mk-build-mmc-qdsk-images.patch

@@ -1,7 +1,7 @@
-From 633632f950423d7fcc588bb9d79fe6ca9d0fa516 Mon Sep 17 00:00:00 2001
+From 132689b25103a48ac7c8fb0af64a6a99080ca192 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sun, 22 May 2022 16:56:10 +0200
-Subject: [PATCH 35/43] include/image-commands.mk: build mmc qdsk images
+Subject: [PATCH 04/68] include/image-commands.mk: build mmc qdsk images
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0005-rstrip.sh-do-not-strip-FW-binaries.patch

@@ -1,7 +1,7 @@
-From f8a801dee8bf0706e349f8f9a7ca1e1fb2fcd42a Mon Sep 17 00:00:00 2001
+From c7923aafa72d82f9b2439314c80a5345ffb4e847 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 22 Jan 2024 12:21:02 +0100
-Subject: [PATCH] rstrip.sh: do not strip FW binaries
+Subject: [PATCH 05/68] rstrip.sh: do not strip FW binaries
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0006-kernel-add-v5.4-checksums.patch

@@ -1,7 +1,7 @@
-From 19f767a964da631e3e427d30b2700fa49ef57c1d Mon Sep 17 00:00:00 2001
+From 114b1b72b3397c103b8a0b81344b20ebeba4d98c Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sun, 16 Jul 2023 17:34:10 +0200
-Subject: [PATCH] kernel: add v5.4 checksums
+Subject: [PATCH 06/68] kernel: add v5.4 checksums
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -34,10 +34,10 @@ index 0000000000..720c5df91e
 +LINUX_KERNEL_HASH-5.4.260 = 9830820714c8f5985c50071cc9e1b40533ee81a4f6c704916c7148d16e54ebfe
 +endif
 diff --git a/include/target.mk b/include/target.mk
-index 1138502c04..9b4fec659e 100644
+index b5e3e7ff6f..bef904ffbc 100644
 --- a/include/target.mk
 +++ b/include/target.mk
-@@ -279,6 +279,7 @@ ifeq ($(DUMP),1)
+@@ -253,6 +253,7 @@ ifeq ($(DUMP),1)
      CPU_TYPE ?= generic
      CPU_CFLAGS_generic = -mcpu=generic
      CPU_CFLAGS_cortex-a53 = -mcpu=cortex-a53

patches/0007-treewide-replace-libustream-mbedtls-with-openssl.patch

@@ -1,7 +1,7 @@
-From 20832f6a6b314a98cb602004b76c950393ef5524 Mon Sep 17 00:00:00 2001
+From 5ae30d4b5bf67788493b96a53d343c3518b9a56b Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 2 Oct 2023 11:14:11 +0200
-Subject: [PATCH] treewide: replace libustream-mbedtls with -openssl
+Subject: [PATCH 07/68] treewide: replace libustream-mbedtls with -openssl
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/target.mk b/include/target.mk
-index 05bea8d334..f11812d073 100644
+index bef904ffbc..4677ef5c49 100644
 --- a/include/target.mk
 +++ b/include/target.mk
 @@ -17,7 +17,7 @@ DEFAULT_PACKAGES:=\

patches/0008-busybox-enable-the-watchdog-tool.patch

@@ -1,7 +1,7 @@
-From 050a312f34d425abc7ddb303f14913d737b45142 Mon Sep 17 00:00:00 2001
+From 21a8cd307466ad50a66bfc2f62687949d408a06f Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 15 Jul 2023 10:46:42 +0200
-Subject: [PATCH 05/43] busybox: enable the watchdog tool
+Subject: [PATCH 08/68] busybox: enable the watchdog tool
 
 procd can currently only handle the main wdt. Enable the busybox
 applet until procd can handle multiple devices.

patches/0009-busybox-udhcpc-would-enter-an-endless-loop-if-the-in.patch

@@ -1,8 +1,8 @@
-From 912cf16c2f15d2081049eafe8d336dbc2b7d8c78 Mon Sep 17 00:00:00 2001
+From c588df50abd3b394e7468f432434f70f03976a4a Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 9 Nov 2023 12:28:38 +0100
-Subject: [PATCH] busybox: udhcpc would enter an endless loop if the interface
- is down
+Subject: [PATCH 09/68] busybox: udhcpc would enter an endless loop if the
+ interface is down
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0010-base-files-set-default-password-to-openwifi.patch

@@ -1,7 +1,7 @@
-From 23d6181abeb100726f2185077318eb5983111c00 Mon Sep 17 00:00:00 2001
+From 100daba45a9ad9eb9ce3b01d111d17a09268e5f8 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 15 Jul 2023 10:45:06 +0200
-Subject: [PATCH 06/43] base-files: set default password to "openwifi"
+Subject: [PATCH 10/68] base-files: set default password to "openwifi"
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0011-base-files-update-banner.patch

@@ -1,7 +1,7 @@
-From fc2a78a9e8714989530e399d833407df472edd3e Mon Sep 17 00:00:00 2001
+From 67c00e49c40b901f7512fd8d97a17fdd6851c727 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 31 Jul 2020 17:15:13 +0200
-Subject: [PATCH 07/43] base-files: update banner
+Subject: [PATCH 11/68] base-files: update banner
 
 Use OpenWiFi for the banner.
 

patches/0012-base-files-add-the-wlan-ap-repo-hash.patch

@@ -1,7 +1,7 @@
-From f36cff29ac40469f2a11065b4c4a00329dfab47e Mon Sep 17 00:00:00 2001
+From 767c3bd265ecd6aa7cc4cf9e58e3ee32a7835a4f Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 29 Aug 2020 08:25:41 +0200
-Subject: [PATCH 08/43] base-files: add the wlan-ap repo hash
+Subject: [PATCH 12/68] base-files: add the wlan-ap repo hash
 
 currently the banner will show the revision of the build tree.
 This patch adds the hash of the wlan-ap tree.

patches/0013-base-files-sysupgrade-always-assume-n-if-f-is-not-pr.patch

@@ -1,7 +1,7 @@
-From 1e236f0c048be74a2ba83f7a8b469bfd8ee1b984 Mon Sep 17 00:00:00 2001
+From 15b8909db31a2dfdfc73c7e62e4decbad83e8c73 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 23 Jan 2023 09:47:54 +0100
-Subject: [PATCH 09/43] base-files: sysupgrade: always assume -n if -f is not
+Subject: [PATCH 13/68] base-files: sysupgrade: always assume -n if -f is not
  provided
 
 Signed-off-by: John Crispin <john@phrozen.org>

patches/0014-base-files-add-a-turnoff-command-to-the-led-script.patch

@@ -1,7 +1,7 @@
-From 9bb541b1e6fab8cc3b1e59f823c6fb66cc341c0a Mon Sep 17 00:00:00 2001
+From f8649b68eb0674948cc043454de24aefabc22ce5 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 19 Apr 2021 13:49:20 +0200
-Subject: [PATCH 10/43] base-files: add a turnoff command to the led script
+Subject: [PATCH 14/68] base-files: add a turnoff command to the led script
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0015-base-files-add-wifi-scanning-radio-support-to-board_.patch

@@ -1,7 +1,7 @@
-From 6a1c3236fe645bced0af9f1394cfb71b1820c56a Mon Sep 17 00:00:00 2001
+From 4544419eb73082124fa63226b5f9bdf5625b06ce Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sun, 5 Dec 2021 10:43:34 +0100
-Subject: [PATCH 11/43] base-files: add wifi scanning radio support to
+Subject: [PATCH 15/68] base-files: add wifi scanning radio support to
  board_detect
 
 Signed-off-by: John Crispin <john@phrozen.org>

patches/0016-base-files-add-support-for-v4.4-style-netdev-led-tri.patch

@@ -1,7 +1,7 @@
-From ddaa9e7bb9ff4fe5e5d44a2b154fe9e2cdc6b140 Mon Sep 17 00:00:00 2001
+From 1c4428d4a3a65d189ec5cb6c5f52f4b6eddfc1a6 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 23 Sep 2020 17:34:44 +0200
-Subject: [PATCH 12/43] base-files: add support for v4.4 style netdev led
+Subject: [PATCH 16/68] base-files: add support for v4.4 style netdev led
  triggers
 
 Current owrt scripting cant handle the old v4.4 style sysfs API of led

patches/0017-base-files-add-ucidef_set_wifi_country.patch

@@ -1,7 +1,7 @@
-From d8e5a9690a26149b66bad9e97aa25f3deb63e48a Mon Sep 17 00:00:00 2001
+From 7346bf9308f3016139a2295bad3784941c1efa68 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 22 Sep 2022 15:12:20 +0200
-Subject: [PATCH 22/43] base-files: add ucidef_set_wifi_country
+Subject: [PATCH 17/68] base-files: add ucidef_set_wifi_country
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0018-base-files-add-CI_FWSETENV-support.patch

@@ -0,0 +1,35 @@
+From 8793bd147cf487245ab31193a5d5f92e6a4f45d2 Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Sat, 27 Apr 2024 12:04:31 +0200
+Subject: [PATCH 18/68] base-files: add CI_FWSETENV support
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ package/base-files/files/lib/upgrade/nand.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh
+index d910bf1791..b298b01351 100644
+--- a/package/base-files/files/lib/upgrade/nand.sh
++++ b/package/base-files/files/lib/upgrade/nand.sh
+@@ -14,6 +14,9 @@ CI_UBIPART="${CI_UBIPART:-ubi}"
+ # 'rootfs' UBI volume on NAND contains the rootfs
+ CI_ROOTPART="${CI_ROOTPART:-rootfs}"
+ 
++# update uboot-env if upgrade suceeded
++CI_FWSETENV=
++
+ ubi_mknod() {
+ 	local dir="$1"
+ 	local dev="/dev/$(basename $dir)"
+@@ -429,6 +432,7 @@ nand_do_upgrade() {
+ 
+ nand_do_upgrade_success() {
+ 	if nand_do_restore_config && sync; then
++		[ -n "$CI_FWSETENV" ] && fw_setenv $CI_FWSETENV
+ 		echo "sysupgrade successful"
+ 		umount -a
+ 		reboot -f
+-- 
+2.34.1
+

patches/0019-ucentral-state-OpenWrt-integration.patch

@@ -1,7 +1,7 @@
-From d7dc13e260c94f3686576aa1d64159201683164d Mon Sep 17 00:00:00 2001
+From 2d371ec80cd36192af64a124a90d4ac0d64c1e30 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 11 Sep 2023 08:16:52 +0200
-Subject: [PATCH] ucentral-state: OpenWrt integration
+Subject: [PATCH 19/68] ucentral-state: OpenWrt integration
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0020-hostapd-drop-script.patch

@@ -1,7 +1,7 @@
-From afaa1a556743d23ba94510c4966a8fa578a80950 Mon Sep 17 00:00:00 2001
+From daba19da736e5e508b351ff876b61abb97695880 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 19 Sep 2023 07:05:38 +0200
-Subject: [PATCH] hostapd: drop script
+Subject: [PATCH 20/68] hostapd: drop script
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0021-hostapd-add-TIP-extensions.patch

@@ -1,7 +1,7 @@
-From 71c65e4fc9fc7fca9a0288acd23b746937af750d Mon Sep 17 00:00:00 2001
+From 0beb1d5779370b929c6c2809e599a6669b09ae92 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 17 Aug 2023 19:53:52 +0200
-Subject: [PATCH 51/52] hostapd: add TIP extensions
+Subject: [PATCH 21/68] hostapd: add TIP extensions
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -42,7 +42,7 @@ index 9076ebc44f..2ac2a312d1 100644
  # EAP-SAKE for the integrated EAP server
  #CONFIG_EAP_SAKE=y
 diff --git a/package/network/services/hostapd/patches/600-ubus_support.patch b/package/network/services/hostapd/patches/600-ubus_support.patch
-index 5b2745a3be..046e2a1e07 100644
+index bc80ef0e81..2709a7de1a 100644
 --- a/package/network/services/hostapd/patches/600-ubus_support.patch
 +++ b/package/network/services/hostapd/patches/600-ubus_support.patch
 @@ -110,7 +110,7 @@

patches/0022-hostapd-add-TIP-shell-script.patch

@@ -1,7 +1,7 @@
-From 31bf503eee22ad86d154598bcefb0a8d3db7b5ba Mon Sep 17 00:00:00 2001
+From 4ae79c28e3dc6f662a1604e4d782a706992fdcb1 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 11 Sep 2023 08:27:50 +0200
-Subject: [PATCH] hostapd: add TIP shell script
+Subject: [PATCH 22/68] hostapd: add TIP shell script
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0023-hostapd-add-global_ban-as-a-del_client-option.patch

@@ -1,7 +1,7 @@
-From d648ecd9687b0257d9e4cdcb6856835325fce02d Mon Sep 17 00:00:00 2001
+From ad5df33271d4ab97b49b9241208ab824f9dac850 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 14 Nov 2023 16:50:42 +0100
-Subject: [PATCH] hostapd: add global_ban as a del_client option
+Subject: [PATCH 23/68] hostapd: add global_ban as a del_client option
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0024-hostapd-sync-builtin-patches.patch

@@ -1,7 +1,7 @@
-From b9abe28ab24fbf333960078a9e2255d01cbf408b Mon Sep 17 00:00:00 2001
+From a8d198fccaefa15fbec4dd9ea2c1a489d58c9bd2 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 20 Nov 2023 08:33:42 +0100
-Subject: [PATCH] hostapd: sync builtin patches
+Subject: [PATCH 24/68] hostapd: sync builtin patches
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0025-hostapd-add-missing-NULL-pointer-check-on-radar-noti.patch

@@ -1,7 +1,8 @@
-From 20bf17b6bb9c40a14db5ed9744c3362afe4a67d8 Mon Sep 17 00:00:00 2001
+From 8297e637263deaff4194ed632ebf8df37553a1be Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 9 Jan 2024 12:36:01 +0100
-Subject: [PATCH] hostapd: add missing NULL pointer check on radar notification
+Subject: [PATCH 25/68] hostapd: add missing NULL pointer check on radar
+ notification
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0026-Revert-mac80211-change-default-ifname-to-phy-type-in.patch

@@ -1,7 +1,7 @@
-From ab10243a695beaefcf48aad10d3311c81124b35e Mon Sep 17 00:00:00 2001
+From 339b35db0e1666d0d382aa7ef194ea04a689c197 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 4 Sep 2023 09:02:22 +0200
-Subject: [PATCH 55/55] Revert: mac80211: change default ifname to
+Subject: [PATCH 26/68] Revert: mac80211: change default ifname to
  <phy>-<type><index>
 
     commit 6603748e0ca697f484adfc16a0d49d35ed36954d
@@ -22,10 +22,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
  1 file changed, 3 insertions(+), 18 deletions(-)
 
 diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
-index 3b88af4679..f3c982e9f1 100644
+index 860609305f..5dd780b473 100644
 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
 +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
-@@ -131,7 +131,7 @@ mac80211_hostapd_setup_base() {
+@@ -132,7 +132,7 @@ mac80211_hostapd_setup_base() {
  
  	json_select config
  
@@ -34,7 +34,7 @@ index 3b88af4679..f3c982e9f1 100644
  
  	[ "$auto_channel" -gt 0 ] && json_get_vars acs_exclude_dfs
  	[ -n "$acs_exclude_dfs" ] && [ "$acs_exclude_dfs" -gt 0 ] &&
-@@ -656,28 +656,13 @@ mac80211_check_ap() {
+@@ -620,28 +620,13 @@ mac80211_check_ap() {
  	has_ap=1
  }
  

patches/0027-mac80211-drop-hostapd-common-dependency.patch

@@ -1,7 +1,7 @@
-From 1a81e9b20441216fbdfc77e5f38cdc2c7135fd9e Mon Sep 17 00:00:00 2001
+From bad14d8e6b4cb11bc6a0457113c4c050e342cdaa Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 2 Oct 2023 17:54:01 +0200
-Subject: [PATCH] mac80211: drop hostapd-common dependency
+Subject: [PATCH 27/68] mac80211: drop hostapd-common dependency
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0028-netifd-fix-compile-on-older-kernels.patch

@@ -1,7 +1,7 @@
-From 146aff9ca0ed8795be76401e67ca21ce1ec01281 Mon Sep 17 00:00:00 2001
+From 5ba0f12fbff0bb16af85a05b68403efb6f9adf3a Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 4 Aug 2021 08:36:30 +0200
-Subject: [PATCH] netifd: fix compile on older kernels
+Subject: [PATCH 28/68] netifd: fix compile on older kernels
 
 The ethtool features do not exist on ancient qualcomm kernels.
 Disable that feature if running on QCA.

patches/0029-netifd-Support-DHCP-option-138-and-store-values-in-t.patch

@@ -1,7 +1,7 @@
-From d2bd7480d1306eecf97118487109de0ba5bff1ad Mon Sep 17 00:00:00 2001
+From e4ad9777fae3bb3a71988fa738f16cb8d6884d7e Mon Sep 17 00:00:00 2001
 From: Tanya Singh <tanya_singh@accton.com>
 Date: Tue, 28 Jun 2022 17:11:52 +0800
-Subject: [PATCH 21/43] netifd: Support DHCP option 138 and store values in
+Subject: [PATCH 29/68] netifd: Support DHCP option 138 and store values in
  /tmp/capwap/dhcp_opt.txt
 
 Signed-off-by: Tanya Singh <tanya_singh@accton.com>

patches/0030-netifd-update-to-latest-HEAD.patch

@@ -1,7 +1,7 @@
-From 2060e4df4005eff32ce2f0e9c0649b64b046229b Mon Sep 17 00:00:00 2001
+From fa611ce803cbb53138cc184cf3779cd4edc6fd5d Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 3 Nov 2023 09:36:58 +0100
-Subject: [PATCH] netifd: update to latest HEAD
+Subject: [PATCH 30/68] netifd: update to latest HEAD
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
-index e60e592098..4bcb570a49 100644
+index e60e592098..ffbc2613f5 100644
 --- a/package/network/config/netifd/Makefile
 +++ b/package/network/config/netifd/Makefile
 @@ -5,9 +5,9 @@ PKG_RELEASE:=1

patches/0031-netifd-backport-bridge_isolate-patches.patch

@@ -1,7 +1,7 @@
-From 0455c47e0e042952c00a1bd0df00f0152d193d99 Mon Sep 17 00:00:00 2001
+From 1c032d319de40e3eaf457fead60e558620005459 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 22 Nov 2023 12:16:52 +0100
-Subject: [PATCH] netifd: backport bridge_isolate patches
+Subject: [PATCH 31/68] netifd: backport bridge_isolate patches
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0032-netifd-fix-vlan-awareness-bug.patch

@@ -1,7 +1,7 @@
-From 782cefa73e24512dd675b51aa969103bdccee773 Mon Sep 17 00:00:00 2001
+From 85c07855f533db2972144ea2b7ebd086388dd2ce Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 5 Dec 2023 15:57:08 +0100
-Subject: [PATCH] netifd: fix vlan-awareness bug
+Subject: [PATCH 32/68] netifd: fix vlan-awareness bug
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0033-netifd-only-reload-swconfig-if-something-changed.patch

@@ -1,7 +1,7 @@
-From 66382792778a6647ec8809e3858e030b3bbf5554 Mon Sep 17 00:00:00 2001
+From eb0effa19e28137c39a9aeaaf44bbd2c596a1d35 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 15 Jan 2024 13:19:24 +0100
-Subject: [PATCH] netifd: only reload swconfig if something changed
+Subject: [PATCH 33/68] netifd: only reload swconfig if something changed
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0034-netifd-add-psk2-radius.patch

@@ -1,7 +1,7 @@
-From d1e6c2041e21cccdd4fd30b28b3b48765825f976 Mon Sep 17 00:00:00 2001
+From 1cacad19f0b5aa10e27c8c9998cfe30e083a2bc3 Mon Sep 17 00:00:00 2001
 From: Arif Alam <arif.alam@netexperience.com>
 Date: Sun, 24 Mar 2024 12:18:11 -0400
-Subject: [PATCH] netifd: add psk2-radius
+Subject: [PATCH 34/68] netifd: add psk2-radius
 
 Signed-off-by: Arif Alam <arif.alam@netexperience.com>
 ---
@@ -28,5 +28,5 @@ index 0000000000..f6dab51c8a
 + 			auth_type=psk-sae
 + 		;;
 -- 
-2.43.0
+2.34.1
 

patches/0035-ucode-add-TIP-specific-fixes.patch

@@ -1,7 +1,7 @@
-From 582f97930044e786ea30dab8fd200849ce392bf3 Mon Sep 17 00:00:00 2001
+From 164fcae0ac392407bc7d7000216a13d9af920363 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 28 Jul 2023 16:51:13 +0200
-Subject: [PATCH] ucode: add TIP specific fixes
+Subject: [PATCH 35/68] ucode: add TIP specific fixes
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -13,7 +13,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  create mode 100644 package/utils/ucode/patches/0001-fixes.patch
 
 diff --git a/package/utils/ucode/Makefile b/package/utils/ucode/Makefile
-index e2fe4c8bad..4bdd955832 100644
+index e2fe4c8bad..fe401f69b1 100644
 --- a/package/utils/ucode/Makefile
 +++ b/package/utils/ucode/Makefile
 @@ -37,6 +37,13 @@ CMAKE_HOST_OPTIONS += \

patches/0036-ucode-update-to-Git-HEAD-2024-04-15.patch

@@ -1,15 +1,33 @@
-From 9da5e3a378a9358ad92db7a9f56db634d485805e Mon Sep 17 00:00:00 2001
+From 1442fba1d8691e8f93260574f9bb54a85a6e12b3 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 16 Nov 2023 16:06:18 +0100
-Subject: [PATCH] ucode: update to latest HEAD
+Subject: [PATCH 36/68] ucode: update to Git HEAD (2024-04-15)
 
-Signed-off-by: John Crispin <john@phrozen.org>
+96f74b5be829 ubus: make ubus_context first in uc_ubus_connection_t
+7e5830edfb38 nl80211: fix datatype of NL80211_BAND_IFTYPE_ATTR_HE_CAP_{MAC,PHY} attrs
+5c8fd34bac42 nl80211: fix parsing of NL80211_BAND_ATTR_VHT_MCS_SET attribute
+e8d4e4fe967d nl80211: fix decoding of NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET attribute
+30a3f7ad0433 rtnl: store callback in listener registry only on success
+9cbe8294909f rtnl: optimize reception of rtnl events
+534417132e18 rtnl: increase event socket rx buffer size limit to 1 MiB
+3f9811d2f7b7 compiler: close upvalues on loop control statements
+ee4af9b55cb4 vm: rework object iteration
+a275399dd8e2 uci: refactor uci.changes() to match documentation
+1220992631d5 ubus: automatically clear error information
+d6fd94014eea uci: automatically clear error information
+99837f280b61 uloop: automatically clear error information
+ba3855ae3775 lib: fix documentation typo for `pop()` function
+be767ae197ba vm: rework `in` operator semantics
+4ade84e8fb81 ubus: add explicit support for deferring incoming requests
+cfe137be068a uci: remove incorrectly documentated reorder() parameter
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
  package/utils/ucode/Makefile | 232 +++++++++++++----------------------
  1 file changed, 82 insertions(+), 150 deletions(-)
 
 diff --git a/package/utils/ucode/Makefile b/package/utils/ucode/Makefile
-index 5cae355e68..a999d58f93 100644
+index fe401f69b1..e59691026d 100644
 --- a/package/utils/ucode/Makefile
 +++ b/package/utils/ucode/Makefile
 @@ -12,21 +12,31 @@ PKG_RELEASE:=1
@@ -19,9 +37,9 @@ index 5cae355e68..a999d58f93 100644
 -PKG_SOURCE_DATE:=2023-06-06
 -PKG_SOURCE_VERSION:=c7d84aae09691a99ae3db427c0b2463732ef84f4
 -PKG_MIRROR_HASH:=38826ae70d886d1d7ada3fc6591ac807169aa28107f60f7f2e617520083525fb
-+PKG_MIRROR_HASH:=e1a0f98ba865ed5911d5db3bfca55a2f1b825992bf5f7c7e324928d9412d7ae2
-+PKG_SOURCE_DATE:=2023-11-07
-+PKG_SOURCE_VERSION:=a6e75e02528e36f3610a7f0073453018336def2e
++PKG_MIRROR_HASH:=7a4d35d14ede7d853b2095ee239a86aab0b17da2b8cfac814dfa58fabec6374b
++PKG_SOURCE_DATE:=2024-04-15
++PKG_SOURCE_VERSION:=cfe137be068a7ba1895d3c9bcb7b38d21e5a95dd
  PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
  PKG_LICENSE:=ISC
  

patches/0037-iwinfo-add-6E-support.patch

@@ -1,7 +1,7 @@
-From 53f86d4cd4399473090fec41d689ec8675d691ee Mon Sep 17 00:00:00 2001
+From 450fed06edf5f574b322d57f28e01ac2d4c331c9 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 12 May 2022 09:31:11 +0200
-Subject: [PATCH 13/43] iwinfo: add 6E support
+Subject: [PATCH 37/68] iwinfo: add 6E support
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0038-dnsmasq-ignore-dhcp-on-the-ifb-dhcp-interface.patch

@@ -1,7 +1,7 @@
-From db5e1b92b1537f2f38b016233d3de72c8a6ee96e Mon Sep 17 00:00:00 2001
+From c7b338d7d443b42b3053d37f887b175d1dd10ec5 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 13 Jun 2022 13:33:31 +0200
-Subject: [PATCH 14/43] dnsmasq: ignore dhcp on the ifb-dhcp interface
+Subject: [PATCH 38/68] dnsmasq: ignore dhcp on the ifb-dhcp interface
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0039-dnsmasq-enabled-EDNS-configuration-options-CPE-ID-an.patch

@@ -1,7 +1,7 @@
-From 132f222fe8bf0c0506db93ffc13a253bec0d8bce Mon Sep 17 00:00:00 2001
+From b15bb7239408ba59767e39da1adfa8c39c8c6a06 Mon Sep 17 00:00:00 2001
 From: Sohail Ahmad <sohail@indionetworks.com>
 Date: Mon, 5 Dec 2022 02:58:36 +0000
-Subject: [PATCH 23/43] dnsmasq: enabled EDNS configuration options- CPE ID and
+Subject: [PATCH 39/68] dnsmasq: enabled EDNS configuration options- CPE ID and
  subnet
 
 Signed-off-by: Sohail Ahmad <sohail@indionetworks.com>

patches/0040-wireguard-tools-do-not-select-the-kernel-module.patch

@@ -1,7 +1,7 @@
-From 33d4a794f51e0f2f6ba4ef00cd403d9fb7ba7547 Mon Sep 17 00:00:00 2001
+From 8d592cb3bb31b0013c20254910426ac1ea78cda1 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 13 Jun 2022 13:37:17 +0200
-Subject: [PATCH 15/43] wireguard-tools: do not select the kernel module
+Subject: [PATCH 40/68] wireguard-tools: do not select the kernel module
 
 unetd will select the correct kernel module.
 

patches/0041-libubox-do-not-clear-the-cancled-flag-when-a-runqueu.patch

@@ -1,7 +1,7 @@
-From cc8027b53b5cc7547d91eb93ac76d885274bad14 Mon Sep 17 00:00:00 2001
+From 87373db3b74851bc9ff550cb42189a9051a01052 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 7 Sep 2022 11:08:14 +0200
-Subject: [PATCH 16/43] libubox: do not clear the cancled flag when a runqueue
+Subject: [PATCH 41/68] libubox: do not clear the cancled flag when a runqueue
  task is aborted
 
 Signed-off-by: John Crispin <john@phrozen.org>

patches/0042-libubox-use-CLOCK_BOOTTIME.patch

@@ -1,7 +1,7 @@
-From a38aed3f16c366b51f3350b4fb5008f6b5840b4e Mon Sep 17 00:00:00 2001
+From 4ac28dad273ac877ee2cb7715782da7b35a09c5c Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 22 Nov 2023 06:51:59 +0100
-Subject: [PATCH] libubox: use CLOCK_BOOTTIME
+Subject: [PATCH 42/68] libubox: use CLOCK_BOOTTIME
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0043-libubox-update-to-Git-HEAD-2024-03-29.patch

@@ -1,7 +1,7 @@
-From ffd7f16859cdf7af8a6ac4b3a5d8f02e06fbd2ce Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 16 Apr 2024 11:22:33 +0200
-Subject: [PATCH 80/83] libubox: update to Git HEAD (2024-03-29)
+From 0aa547927583783ce0669851c5bcbb0d30134542 Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Thu, 16 Nov 2023 16:05:32 +0100
+Subject: [PATCH 43/68] libubox: update to Git HEAD (2024-03-29)
 
 13d9b04fb09d uloop: add support for user defined signal handlers
 f7d156911311 uloop: properly initialize signal handler mask
@@ -29,16 +29,16 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile
-index 28d0d5f9ce..6bba69ed27 100644
+index c62278adc5..6bba69ed27 100644
 --- a/package/libs/libubox/Makefile
 +++ b/package/libs/libubox/Makefile
 @@ -5,9 +5,9 @@ PKG_RELEASE=1
  
  PKG_SOURCE_PROTO:=git
  PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git
--PKG_MIRROR_HASH:=a0db9ed4ed26f2346c28902a78cd138750f3cad18a1a8b1bb960a2a6c397c773
+-PKG_MIRROR_HASH:=f22de22a784a0135cc2869fe81ff30e52136dca36863ee713503b4be5be01869
 -PKG_SOURCE_DATE:=2023-05-23
--PKG_SOURCE_VERSION:=82fa6480de7a85d0ced0701ab7c8825e31b90770
+-PKG_SOURCE_VERSION:=75a3b870cace1171faf57bd55e5a9a2f1564f757
 +PKG_MIRROR_HASH:=242e33eca235124c7e005d25fbc8f8bf08a324335343e60278d4535c91157ba4
 +PKG_SOURCE_DATE:=2024-03-29
 +PKG_SOURCE_VERSION:=eb9bcb64185ac155c02cc1a604692c4b00368324

patches/0044-umdns-update-to-latest-HEAD.patch

@@ -1,7 +1,7 @@
-From c77d29307ee315810d1f025850b345d4fbc24099 Mon Sep 17 00:00:00 2001
+From 79a5708c79edee469c1c92f8e8298684ea80ddad Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 25 Mar 2024 11:18:19 +0100
-Subject: [PATCH] umdns: update to latest HEAD
+Subject: [PATCH 44/68] umdns: update to latest HEAD
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0045-ustream-ssl-update-to-Git-HEAD-2024-04-07.patch

@@ -1,7 +1,7 @@
-From bcf4d243459ffb7042aca3017f4e741b24d7673e Mon Sep 17 00:00:00 2001
+From 885c5c7a71dc2b377f8df5dc926fc2d5b3ff9cf1 Mon Sep 17 00:00:00 2001
 From: Felix Fietkau <nbd@nbd.name>
 Date: Tue, 16 Apr 2024 11:23:39 +0200
-Subject: [PATCH 81/83] ustream-ssl: update to Git HEAD (2024-04-07)
+Subject: [PATCH 45/68] ustream-ssl: update to Git HEAD (2024-04-07)
 
 91666a38b7bd ustream-mbedtls: Add compatibility with Mbed TLS 3.0.0
 263b9a97cf7e cmake: Fail if undefined symbols are used

patches/0046-uclient-update-to-Git-HEAD-2024-04-05.patch

@@ -1,7 +1,7 @@
-From 758f1f7d4a0ce954b9ca941820cfb0b673112839 Mon Sep 17 00:00:00 2001
+From f5b1e75e8093b4d60c52c3940c65b3caf9098292 Mon Sep 17 00:00:00 2001
 From: Felix Fietkau <nbd@nbd.name>
 Date: Tue, 16 Apr 2024 11:22:20 +0200
-Subject: [PATCH 83/83] uclient: update to Git HEAD (2024-04-05)
+Subject: [PATCH 46/68] uclient: update to Git HEAD (2024-04-05)
 
 e209a4ced1d8 add strdupa macro for compatibility
 af1962b9a609 uclient: add helper function for getting ustream-ssl context/ops

patches/0047-ugps-update-to-latest-HEAD.patch

@@ -1,22 +1,24 @@
-From 870473cd263bb21b37734765c091fd50e9cb6fde Mon Sep 17 00:00:00 2001
+From 1bf217997a4a962a4cbf02d6412e835016b87ce7 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 27 Jan 2023 13:42:32 +0100
-Subject: [PATCH 17/43] ugps: update to latest HEAD
+Subject: [PATCH 47/68] ugps: update to latest HEAD
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
- package/utils/ugps/Makefile         | 5 ++---
+ package/utils/ugps/Makefile         | 6 +++---
  package/utils/ugps/files/gps.config | 3 ++-
  package/utils/ugps/files/ugps.init  | 2 ++
- 3 files changed, 6 insertions(+), 4 deletions(-)
+ 3 files changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/package/utils/ugps/Makefile b/package/utils/ugps/Makefile
-index 5afba4e0b0..0cd95576fb 100644
+index 5afba4e0b0..862753935f 100644
 --- a/package/utils/ugps/Makefile
 +++ b/package/utils/ugps/Makefile
-@@ -12,9 +12,8 @@ PKG_RELEASE:=2
+@@ -11,10 +11,10 @@ PKG_NAME:=ugps
+ PKG_RELEASE:=2
  
  PKG_SOURCE_URL=$(PROJECT_GIT)/project/ugps.git
++PKG_MIRROR_HASH:=a277970547a42dd5638873905eacf591d011cad7ba8db88a3344dc3204e68929
  PKG_SOURCE_PROTO:=git
 -PKG_SOURCE_DATE:=2021-06-08
 -PKG_SOURCE_VERSION:=5e88403fc0d39ae8a270d2c6c6e9c8a4d5232cf3

patches/0048-lldp-add-TIP-tweaks.patch

@@ -1,7 +1,7 @@
-From e0e35c5b940e2e821c6143ce995e7fe842b8b0c9 Mon Sep 17 00:00:00 2001
+From dcd437c439d05fa76c5da1a8629e3a778000f7c8 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 15 Jul 2023 15:40:38 +0200
-Subject: [PATCH 18/43] lldp: add TIP tweaks
+Subject: [PATCH 48/68] lldp: add TIP tweaks
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0049-firewall3-4-enable-ssh-on-wan-during-early-boot-stag.patch

@@ -1,7 +1,7 @@
-From a360344ee35b1a2fe56a703f5e192c928f7108bd Mon Sep 17 00:00:00 2001
+From 8cdfdc8ed6b7bc247c1cc8130f4ee66e7fdc23cc Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 15 Jul 2023 15:50:22 +0200
-Subject: [PATCH 19/43] firewall3/4: enable ssh on wan during early boot stage
+Subject: [PATCH 49/68] firewall3/4: enable ssh on wan during early boot stage
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0050-ramips-reduce-yuncore-ax820-SPI-clock-speed-to-20MHz.patch

@@ -1,7 +1,7 @@
-From 594261d2f696136b9cb1d63fd4706248b5cd9ffa Mon Sep 17 00:00:00 2001
+From e3ea75eae5d09d88d1d00620bf689c5fa0a557bb Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 17 Jan 2024 09:58:18 +0100
-Subject: [PATCH] ramips: reduce yuncore ax820 SPI clock speed to 20MHz
+Subject: [PATCH 50/68] ramips: reduce yuncore ax820 SPI clock speed to 20MHz
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/target/linux/ramips/dts/mt7621_yuncore_ax820.dts b/target/linux/ramips/dts/mt7621_yuncore_ax820.dts
-index 51fd358095..b2f55b9be0 100644
+index 1aba94a912..dd7346f6d0 100644
 --- a/target/linux/ramips/dts/mt7621_yuncore_ax820.dts
 +++ b/target/linux/ramips/dts/mt7621_yuncore_ax820.dts
 @@ -87,7 +87,7 @@

patches/0051-elfutils-GCC5-compile-fix.patch

@@ -1,7 +1,7 @@
-From 5b61c5de9334f24302741c2c964580023ee3c611 Mon Sep 17 00:00:00 2001
+From d01730336c6e318bb483bb73bb9188fdc71b42ed Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sun, 16 Jul 2023 17:15:05 +0200
-Subject: [PATCH 24/43] elfutils: GCC5 compile fix
+Subject: [PATCH 51/68] elfutils: GCC5 compile fix
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0052-generic-enable-pstore-support.patch

@@ -1,7 +1,7 @@
-From 033837cb7e161710d2d1c2d0dfce504c75284888 Mon Sep 17 00:00:00 2001
+From e886d2090484b46dc7759afe9a229ba906d80d57 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 15 Jul 2023 11:58:50 +0200
-Subject: [PATCH 25/43] generic: enable pstore support
+Subject: [PATCH 52/68] generic: enable pstore support
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -9,10 +9,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
-index 637b845ac4..4bb77e224a 100644
+index 214a1e6ecd..177562ad17 100644
 --- a/target/linux/generic/config-5.15
 +++ b/target/linux/generic/config-5.15
-@@ -4838,21 +4838,21 @@ CONFIG_PROC_SYSCTL=y
+@@ -4844,21 +4844,21 @@ CONFIG_PROC_SYSCTL=y
  # CONFIG_PSAMPLE is not set
  # CONFIG_PSB6970_PHY is not set
  # CONFIG_PSI is not set

patches/0053-gpio-button-hotplug-use-ancient-version-of-the-drive.patch

@@ -1,7 +1,7 @@
-From 359d3bf3923274b1489c8a5b83fd774e091915e3 Mon Sep 17 00:00:00 2001
+From c76fd282854f1b2108ba5a8fc834108817fec264 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 15 Jul 2023 17:49:12 +0200
-Subject: [PATCH 26/43] gpio-button-hotplug: use ancient version of the driver
+Subject: [PATCH 53/68] gpio-button-hotplug: use ancient version of the driver
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0054-Add-RTL8367C-S-switch-compile-option.patch

@@ -1,7 +1,7 @@
-From 5da6b1fb680c9a0315cb810be2d7bd6745d51883 Mon Sep 17 00:00:00 2001
+From 3b2752de74e9e47c1088575d90ef81474aec65c3 Mon Sep 17 00:00:00 2001
 From: Ken <xshi@actiontec.com>
 Date: Tue, 17 Oct 2023 11:01:25 +0800
-Subject: [PATCH] [Patch] Add RTL8367C/S switch compile option
+Subject: [PATCH 54/68] Add RTL8367C/S switch compile option
 
 ---
  package/kernel/linux/modules/netdevices.mk | 18 +++++++++++++++++-

patches/0055-ath79-add-Support-for-Indio-305AC.patch

@@ -1,7 +1,7 @@
-From 1311b98f29ac98669ae243f4d793ad6500cf0b8b Mon Sep 17 00:00:00 2001
+From 33752cc0bbadf34aac485c6e4c314bb6528f4d91 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 15 Jul 2023 12:05:30 +0200
-Subject: [PATCH 30/43] ath79: add Support for Indio 305AC
+Subject: [PATCH 55/68] ath79: add Support for Indio 305AC
 
 Signed-off-by: Rohan Nathi <rohan.nathi@indionetworks.com>
 ---

patches/0056-ath79-enable-bridge-vlan.patch

@@ -1,7 +1,7 @@
-From 3fcc5230cb60daa8bd01bb1b781a9685643e8a49 Mon Sep 17 00:00:00 2001
+From b7d537f23e2e30282cc4003256471ca590e505f3 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 15 Jul 2023 12:08:40 +0200
-Subject: [PATCH 31/43] ath79: enable bridge vlan
+Subject: [PATCH 56/68] ath79: enable bridge vlan
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -9,10 +9,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
  1 file changed, 1 insertion(+)
 
 diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
-index 4f535f8a64..5b98d50183 100644
+index 0d7396a04d..f819d3c8b8 100644
 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
 +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
-@@ -818,6 +818,7 @@ ath79_setup_macs()
+@@ -822,6 +822,7 @@ ath79_setup_macs()
  
  board_config_update
  board=$(board_name)

patches/0057-ramips-add-certificates-partitions.patch

@@ -1,7 +1,7 @@
-From b3177e08af3db3ddee379869450e35f810362d5c Mon Sep 17 00:00:00 2001
+From 3894dfab479eaf6c97a537b6de4fd70d7265e178 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 15 Jul 2023 15:16:57 +0200
-Subject: [PATCH 01/15] ramips: add certificates partitions
+Subject: [PATCH 57/68] ramips: add certificates partitions
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  2 files changed, 12 insertions(+), 2 deletions(-)
 
 diff --git a/target/linux/ramips/dts/mt7621_yuncore_ax820.dts b/target/linux/ramips/dts/mt7621_yuncore_ax820.dts
-index 1aba94a912..51fd358095 100644
+index dd7346f6d0..b2f55b9be0 100644
 --- a/target/linux/ramips/dts/mt7621_yuncore_ax820.dts
 +++ b/target/linux/ramips/dts/mt7621_yuncore_ax820.dts
 @@ -120,7 +120,12 @@

patches/0058-ramips-add-mt7621_indio_um-305ax.patch

@@ -1,7 +1,7 @@
-From eeec43439f2f53cd88c03b73a6092d342d56bff6 Mon Sep 17 00:00:00 2001
+From ec135e7aefac08806fbabb0634a2bd88a169dfc6 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 15 Jul 2023 15:25:59 +0200
-Subject: [PATCH 33/43] ramips: add mt7621_indio_um-305ax
+Subject: [PATCH 58/68] ramips: add mt7621_indio_um-305ax
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -206,10 +206,10 @@ index 0000000000..79cffbdec2
 +};
 +
 diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
-index fa4c83dbe1..97505c3504 100644
+index 962d7ef440..8790a2fa50 100644
 --- a/target/linux/ramips/image/mt7621.mk
 +++ b/target/linux/ramips/image/mt7621.mk
-@@ -1136,6 +1136,17 @@ define Device/huasifei_ws1208v2
+@@ -1148,6 +1148,17 @@ define Device/huasifei_ws1208v2
  endef
  TARGET_DEVICES += huasifei_ws1208v2
  
@@ -228,10 +228,10 @@ index fa4c83dbe1..97505c3504 100644
    $(Device/dsa-migration)
    $(Device/uimage-lzma-loader)
 diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
-index 6057c17192..405da43bdb 100644
+index bd1d394892..0f6b7fd526 100644
 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
 +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
-@@ -58,6 +58,7 @@ ramips_setup_interfaces()
+@@ -60,6 +60,7 @@ ramips_setup_interfaces()
  		;;
  	asiarf,ap7621-001|\
  	humax,e10|\
@@ -239,7 +239,7 @@ index 6057c17192..405da43bdb 100644
  	wavlink,ws-wn572hp3-4g|\
  	winstars,ws-wn583a6)
  		ucidef_set_interfaces_lan_wan "lan" "wan"
-@@ -146,6 +147,11 @@ ramips_setup_interfaces()
+@@ -148,6 +149,11 @@ ramips_setup_interfaces()
  	*)
  		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
  		;;

patches/0059-x86-Set-eth0-as-WAN-interface-by-default-for-x86.patch

@@ -1,7 +1,7 @@
-From 87846201a8a268ac76f27a81830523d1ea75e56c Mon Sep 17 00:00:00 2001
+From c751d55bc0247c0b4653c46476f6b64252bcb809 Mon Sep 17 00:00:00 2001
 From: Johann Hoffmann <johann.hoffmann@mailbox.org>
 Date: Mon, 11 Apr 2022 17:25:43 +0000
-Subject: [PATCH 34/43] x86: Set eth0 as WAN interface by default for x86
+Subject: [PATCH 59/68] x86: Set eth0 as WAN interface by default for x86
 
 Signed-off-by: Johann Hoffmann <johann.hoffmann@mailbox.org>
 ---

patches/0060-ipq807x-add-gcc-5-support.patch

@@ -1,7 +1,7 @@
-From 5eb23f252c2d3cf754d98120f30c6b8a4e054671 Mon Sep 17 00:00:00 2001
+From 9386f610a24a250cf1f770548c3e394f3f2a1185 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 15 Jul 2023 16:00:29 +0200
-Subject: [PATCH 36/43] ipq807x: add gcc-5 support
+Subject: [PATCH 60/68] ipq807x: add gcc-5 support
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -154,12 +154,12 @@ index 7126a0c883..e29c5b9aa8 100644
  	default "13.1.0"	if GCC_VERSION_13
  	default "12.3.0"
 diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
-index 677fb25381..00c908dd60 100644
+index 31a1492f3a..47b3446701 100644
 --- a/toolchain/gcc/common.mk
 +++ b/toolchain/gcc/common.mk
-@@ -29,6 +29,10 @@ GCC_DIR:=$(PKG_NAME)-$(PKG_VERSION)
- PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION)
+@@ -30,6 +30,10 @@ PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION)
  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+ PKG_CPE_ID:=cpe:/a:gnu:gcc
  
 +ifeq ($(PKG_VERSION),5.5.0)
 +  PKG_HASH:=530cea139d82fe542b358961130c69cfde8b3d14556370b65823d2f91f0ced87

patches/0061-ipq807x-add-uboot-envtools-support.patch

@@ -1,7 +1,7 @@
-From 9cfa8a26ef07293733d2d606d6e7b0912aba4ec5 Mon Sep 17 00:00:00 2001
+From b4de8243ca22d160f9cad42ed0f145e90ac98249 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 15 Jul 2023 16:10:26 +0200
-Subject: [PATCH 37/43] ipq807x: add uboot-envtools support
+Subject: [PATCH 61/68] ipq807x: add uboot-envtools support
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0062-ipq807x-prepare-tree-for-old-v4.4-kernel.patch

@@ -1,7 +1,7 @@
-From 4c44057eb1873f0a0a34b6c598872fdd105b6e9c Mon Sep 17 00:00:00 2001
+From a26f8da848b17a1d4f201f0b765402382ecf405c Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 15 Jul 2023 16:11:26 +0200
-Subject: [PATCH 38/43] ipq807x: prepare tree for old v4.4 kernel
+Subject: [PATCH 62/68] ipq807x: prepare tree for old v4.4 kernel
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -14,7 +14,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  include/netfilter.mk                       |   32 +-
  include/package.mk                         |    8 +-
  include/quilt.mk                           |    4 +
- include/target.mk                          |   27 +-
+ include/target.mk                          |   25 +-
  package/kernel/linux/modules/can.mk        |    3 +-
  package/kernel/linux/modules/crypto.mk     |    3 +-
  package/kernel/linux/modules/fs.mk         |    3 +-
@@ -26,7 +26,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  target/linux/generic/config-5.4-qsdk       | 6189 ++++++++++++++++++++
  toolchain/gcc/common.mk                    |    4 +-
  toolchain/kernel-headers/Makefile          |   13 +-
- 21 files changed, 11539 insertions(+), 33 deletions(-)
+ 21 files changed, 11537 insertions(+), 33 deletions(-)
  create mode 100644 include/kernel-4.4
  create mode 100644 include/netfilter-4.4.mk
  create mode 100644 target/linux/generic/config-4.4-qsdk
@@ -49,7 +49,7 @@ index ea7b3d37c3..8413f218a6 100644
  			default TARGET_INITRAMFS_COMPRESSION_NONE
  			depends on TARGET_ROOTFS_INITRAMFS
 diff --git a/config/Config-kernel.in b/config/Config-kernel.in
-index 32524f5aed..5756da726f 100644
+index c1bc7984f7..7bc0fbf9a5 100644
 --- a/config/Config-kernel.in
 +++ b/config/Config-kernel.in
 @@ -2,6 +2,15 @@
@@ -68,7 +68,7 @@ index 32524f5aed..5756da726f 100644
  config KERNEL_BUILD_USER
  	string "Custom Kernel Build User Name"
  	default "builder" if BUILDBOT
-@@ -671,6 +680,7 @@ endif
+@@ -672,6 +681,7 @@ endif
  config KERNEL_KEYS
  	bool "Enable kernel access key retention support"
  	default !SMALL_FLASH
@@ -695,7 +695,7 @@ index c391d320aa..12ecb2cca6 100644
    ifeq ($(call pkg_build_flag,mips16,1),1)
      TARGET_ASFLAGS_DEFAULT = $(filter-out -mips16 -minterlink-mips16,$(TARGET_CFLAGS))
 diff --git a/include/quilt.mk b/include/quilt.mk
-index 18cafe60a2..a860c557de 100644
+index 18cafe60a2..038c974e32 100644
 --- a/include/quilt.mk
 +++ b/include/quilt.mk
 @@ -99,9 +99,11 @@ define Kernel/Patch/Default
@@ -723,7 +723,7 @@ index 18cafe60a2..a860c557de 100644
  endef
  
 diff --git a/include/target.mk b/include/target.mk
-index b5e3e7ff6f..36e1377617 100644
+index 4677ef5c49..3b3081a470 100644
 --- a/include/target.mk
 +++ b/include/target.mk
 @@ -62,6 +62,18 @@ DEFAULT_PACKAGES.router:=\
@@ -745,7 +745,7 @@ index b5e3e7ff6f..36e1377617 100644
  ifneq ($(DUMP),)
    all: dumpinfo
  endif
-@@ -147,16 +158,30 @@ ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),)
+@@ -147,16 +159,27 @@ ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),)
  endif
  
  GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic
@@ -770,9 +770,6 @@ index b5e3e7ff6f..36e1377617 100644
 +else
  GENERIC_LINUX_CONFIG = $(call find_kernel_config,$(GENERIC_PLATFORM_DIR))
 +endif
-+ifeq ($(CONFIG_LINUX_4_4),y)
-+GENERIC_LINUX_CONFIG:=$(GENERIC_PLATFORM_DIR)/config-4.4-qsdk
-+endif
 +
  LINUX_TARGET_CONFIG = $(call find_kernel_config,$(PLATFORM_DIR))
  ifneq ($(PLATFORM_DIR),$(PLATFORM_SUBDIR))
@@ -856,10 +853,10 @@ index 0d2f8a9140..38a6dd316f 100644
  endef
  
 diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
-index 7f1905311f..4ee7ecf8d5 100644
+index 27268ee043..27ba55a22d 100644
 --- a/package/kernel/linux/modules/netsupport.mk
 +++ b/package/kernel/linux/modules/netsupport.mk
-@@ -809,7 +809,7 @@ $(eval $(call KernelPackage,sched-bpf))
+@@ -810,7 +810,7 @@ $(eval $(call KernelPackage,sched-bpf))
  define KernelPackage/sched-cake
    SUBMENU:=$(NETWORK_SUPPORT_MENU)
    TITLE:=Cake fq_codel/blue derived shaper
@@ -868,7 +865,7 @@ index 7f1905311f..4ee7ecf8d5 100644
    KCONFIG:=CONFIG_NET_SCH_CAKE
    FILES:=$(LINUX_DIR)/net/sched/sch_cake.ko
    AUTOLOAD:=$(call AutoProbe,sch_cake)
-@@ -1285,7 +1285,7 @@ $(eval $(call KernelPackage,rxrpc))
+@@ -1298,7 +1298,7 @@ $(eval $(call KernelPackage,rxrpc))
  define KernelPackage/mpls
    SUBMENU:=$(NETWORK_SUPPORT_MENU)
    TITLE:=MPLS support
@@ -11941,10 +11938,10 @@ index 0000000000..e5e20c39cd
 +CONFIG_NF_CONNTRACK_DSCPREMARK_EXT=y
 +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
-index 00c908dd60..3baf70b151 100644
+index 47b3446701..c944979765 100644
 --- a/toolchain/gcc/common.mk
 +++ b/toolchain/gcc/common.mk
-@@ -200,7 +200,9 @@ ifeq ($(GCC_MAJOR_VERSION),11)
+@@ -201,7 +201,9 @@ ifeq ($(GCC_MAJOR_VERSION),11)
  else
  	GCC_VERSION_FILE:=gcc/genversion.cc
  endif
@@ -11956,7 +11953,7 @@ index 00c908dd60..3baf70b151 100644
    define Host/Prepare
  	$(call Host/SetToolchainInfo)
 diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
-index eea0ffbde0..faea9afab4 100644
+index cd25f8a6de..fa8393db80 100644
 --- a/toolchain/kernel-headers/Makefile
 +++ b/toolchain/kernel-headers/Makefile
 @@ -14,6 +14,17 @@ override HOST_QUILT:=
@@ -11977,7 +11974,7 @@ index eea0ffbde0..faea9afab4 100644
  PKG_NAME:=linux
  PKG_VERSION:=$(LINUX_VERSION)
  PKG_SOURCE:=$(LINUX_SOURCE)
-@@ -32,7 +43,7 @@ else
+@@ -33,7 +44,7 @@ else
    PKG_SOURCE:=$(LINUX_SOURCE)
    PKG_SOURCE_URL:=$(LINUX_SITE)
  endif

patches/0063-ipq807x-package-linux-hack.patch

@@ -1,7 +1,7 @@
-From aebe1b77a68ee3e438651185916b6e6fe093bed9 Mon Sep 17 00:00:00 2001
+From b34ac50047c3970599311a0e278f4533d8d5136d Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sun, 16 Jul 2023 17:15:23 +0200
-Subject: [PATCH 40/43] ipq807x: package/linux hack
+Subject: [PATCH 63/68] ipq807x: package/linux hack
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  1 file changed, 4 insertions(+)
 
 diff --git a/package/Makefile b/package/Makefile
-index 4b8df7f484..128a0814a0 100644
+index 4b8df7f484..e93c4410a8 100644
 --- a/package/Makefile
 +++ b/package/Makefile
 @@ -11,7 +11,11 @@ include $(INCLUDE_DIR)/feeds.mk

patches/0064-ipq807x-add-ubi-force-detach-patch.patch

@@ -1,7 +1,7 @@
-From 3dd22aa711f2f8c8e968d21cbac85beb713760af Mon Sep 17 00:00:00 2001
+From 72df1f97e4affaa58290e520ded515b24371f01c Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sun, 16 Jul 2023 17:21:04 +0200
-Subject: [PATCH 41/43] ipq807x: add ubi force detach patch
+Subject: [PATCH 64/68] ipq807x: add ubi force detach patch
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0065-ipq807x-drop-nand.sh-from-base-files.patch

@@ -1,7 +1,7 @@
-From 2a53eaa80156c56a8ea7881ba6b4295613faf399 Mon Sep 17 00:00:00 2001
+From f88771a522d983e6e169b66c56d9f8ff2e420653 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sun, 16 Jul 2023 17:30:49 +0200
-Subject: [PATCH 42/43] ipq807x: drop nand.sh from base-files
+Subject: [PATCH 65/68] ipq807x: drop nand.sh from base-files
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  1 file changed, 7 insertions(+)
 
 diff --git a/package/base-files/Makefile b/package/base-files/Makefile
-index dc89de2035..dd1d0760f8 100644
+index dc89de2035..49689a3f03 100644
 --- a/package/base-files/Makefile
 +++ b/package/base-files/Makefile
 @@ -138,6 +138,12 @@ ifeq ($(CONFIG_NAND_SUPPORT),)

patches/0066-ipq807x-fix-usb-dwc3-dependencies.patch

@@ -1,12 +1,27 @@
-From ff6d59ce79976176caaee181b2a75dc17fb4df41 Mon Sep 17 00:00:00 2001
+From dfd8504de62441105785f155449f67f2f78e4001 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sun, 6 Aug 2023 09:46:57 +0200
-Subject: [PATCH] ipq807x: fix usb dwc3 dependencies
+Subject: [PATCH 66/68] ipq807x: fix usb dwc3 dependencies
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
- package/kernel/linux/modules/usb.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ package/kernel/linux/modules/netsupport.mk | 3 ++-
+ package/kernel/linux/modules/usb.mk        | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
+index 27ba55a22d..d6b28c51b7 100644
+--- a/package/kernel/linux/modules/netsupport.mk
++++ b/package/kernel/linux/modules/netsupport.mk
+@@ -93,7 +93,8 @@ define KernelPackage/vxlan
+ 	+IPV6:kmod-udptunnel6
+   KCONFIG:=CONFIG_VXLAN
+   FILES:= \
+-	$(LINUX_DIR)/drivers/net/vxlan/vxlan.ko
++	$(LINUX_DIR)/drivers/net/vxlan/vxlan.ko@ge5.5 \
++	$(LINUX_DIR)/drivers/net/vxlan.ko@le5.4
+   AUTOLOAD:=$(call AutoLoad,13,vxlan)
+ endef
  
 diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
 index 2561f36aa3..721cc7893b 100644
@@ -24,17 +39,3 @@ index 2561f36aa3..721cc7893b 100644
 -- 
 2.34.1
 
-diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
-index 27ba55a22d..d6b28c51b7 100644
---- a/package/kernel/linux/modules/netsupport.mk
-+++ b/package/kernel/linux/modules/netsupport.mk
-@@ -93,7 +93,8 @@ define KernelPackage/vxlan
- 	+IPV6:kmod-udptunnel6
-   KCONFIG:=CONFIG_VXLAN
-   FILES:= \
--	$(LINUX_DIR)/drivers/net/vxlan/vxlan.ko
-+	$(LINUX_DIR)/drivers/net/vxlan/vxlan.ko@ge5.5 \
-+	$(LINUX_DIR)/drivers/net/vxlan.ko@le5.4
-   AUTOLOAD:=$(call AutoLoad,13,vxlan)
- endef
- 

patches/0067-libubox-update-to-latest-HEAD.patch

@@ -1,29 +0,0 @@
-From 3425faa1a72f1aef67d6dc2d229940e6be78d3a0 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Thu, 16 Nov 2023 16:05:32 +0100
-Subject: [PATCH] libubox: update to latest HEAD
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- package/libs/libubox/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile
-index c62278adc5..28d0d5f9ce 100644
---- a/package/libs/libubox/Makefile
-+++ b/package/libs/libubox/Makefile
-@@ -5,9 +5,9 @@ PKG_RELEASE=1
- 
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git
--PKG_MIRROR_HASH:=f22de22a784a0135cc2869fe81ff30e52136dca36863ee713503b4be5be01869
-+PKG_MIRROR_HASH:=a0db9ed4ed26f2346c28902a78cd138750f3cad18a1a8b1bb960a2a6c397c773
- PKG_SOURCE_DATE:=2023-05-23
--PKG_SOURCE_VERSION:=75a3b870cace1171faf57bd55e5a9a2f1564f757
-+PKG_SOURCE_VERSION:=82fa6480de7a85d0ced0701ab7c8825e31b90770
- PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
- CMAKE_INSTALL:=1
- 
--- 
-2.34.1
-

patches/0067-mediatek-sdk-build-tree-hacks.patch

@@ -1,7 +1,7 @@
-From 59eb964b69669fadc09d3fe6b08e1dece98ca61d Mon Sep 17 00:00:00 2001
+From 055af3cc5627530a564b5d85fb0edd14107af564 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 8 Mar 2024 09:34:02 +0100
-Subject: [PATCH 85/86] mediatek-sdk: build tree hacks
+Subject: [PATCH 67/68] mediatek-sdk: build tree hacks
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---

patches/0068-include-target-allow-placing-generic-patch-folders-i.patch

@@ -1,8 +1,8 @@
-From 17cd22fb1fe00384ec4391cd5b3a656d60c65649 Mon Sep 17 00:00:00 2001
+From 387b6b3470231772396c6eaf0c52ff03373b2e88 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 26 Apr 2024 17:00:07 +0200
-Subject: [PATCH] include/target: allow placing generic patch folders into the
- platrom directory
+Subject: [PATCH 68/68] include/target: allow placing generic patch folders
+ into the platrom directory
 
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/include/target.mk b/include/target.mk
-index 9623778d88..9d487a451b 100644
+index 3b3081a470..38578f60c4 100644
 --- a/include/target.mk
 +++ b/include/target.mk
 @@ -165,10 +165,10 @@ GENERIC_PATCH_DIR :=
@@ -35,8 +35,8 @@ index 9623778d88..9d487a451b 100644
 -GENERIC_LINUX_CONFIG = $(call find_kernel_config,$(GENERIC_PLATFORM_DIR))
 +GENERIC_LINUX_CONFIG ?= $(call find_kernel_config,$(GENERIC_PLATFORM_DIR))$(CONFIG_FILE_SUFFIX)
  endif
- ifeq ($(CONFIG_LINUX_4_4),y)
- GENERIC_LINUX_CONFIG:=$(GENERIC_PLATFORM_DIR)/config-4.4-qsdk
+ 
+ LINUX_TARGET_CONFIG = $(call find_kernel_config,$(PLATFORM_DIR))
 -- 
 2.34.1
 

patches/0082-ucode-update-to-Git-HEAD-2024-04-15.patch

@@ -1,48 +0,0 @@
-From e3e1a34b88d4ff7427afddf83c0253092c708b82 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 16 Apr 2024 11:22:29 +0200
-Subject: [PATCH 82/83] ucode: update to Git HEAD (2024-04-15)
-
-96f74b5be829 ubus: make ubus_context first in uc_ubus_connection_t
-7e5830edfb38 nl80211: fix datatype of NL80211_BAND_IFTYPE_ATTR_HE_CAP_{MAC,PHY} attrs
-5c8fd34bac42 nl80211: fix parsing of NL80211_BAND_ATTR_VHT_MCS_SET attribute
-e8d4e4fe967d nl80211: fix decoding of NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET attribute
-30a3f7ad0433 rtnl: store callback in listener registry only on success
-9cbe8294909f rtnl: optimize reception of rtnl events
-534417132e18 rtnl: increase event socket rx buffer size limit to 1 MiB
-3f9811d2f7b7 compiler: close upvalues on loop control statements
-ee4af9b55cb4 vm: rework object iteration
-a275399dd8e2 uci: refactor uci.changes() to match documentation
-1220992631d5 ubus: automatically clear error information
-d6fd94014eea uci: automatically clear error information
-99837f280b61 uloop: automatically clear error information
-ba3855ae3775 lib: fix documentation typo for `pop()` function
-be767ae197ba vm: rework `in` operator semantics
-4ade84e8fb81 ubus: add explicit support for deferring incoming requests
-cfe137be068a uci: remove incorrectly documentated reorder() parameter
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- package/utils/ucode/Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/package/utils/ucode/Makefile b/package/utils/ucode/Makefile
-index e90aa37c8e..e59691026d 100644
---- a/package/utils/ucode/Makefile
-+++ b/package/utils/ucode/Makefile
-@@ -12,9 +12,9 @@ PKG_RELEASE:=1
- 
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL=https://github.com/jow-/ucode.git
--PKG_MIRROR_HASH:=e1a0f98ba865ed5911d5db3bfca55a2f1b825992bf5f7c7e324928d9412d7ae2
--PKG_SOURCE_DATE:=2023-11-07
--PKG_SOURCE_VERSION:=a6e75e02528e36f3610a7f0073453018336def2e
-+PKG_MIRROR_HASH:=7a4d35d14ede7d853b2095ee239a86aab0b17da2b8cfac814dfa58fabec6374b
-+PKG_SOURCE_DATE:=2024-04-15
-+PKG_SOURCE_VERSION:=cfe137be068a7ba1895d3c9bcb7b38d21e5a95dd
- PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
- PKG_LICENSE:=ISC
- 
--- 
-2.34.1
-