Merge branch 'openwrt:master' into master

2023-08-26 17:40:44 +05:30 · 2023-08-26 17:40:44 +05:30 · 8538ecd764
commit 8538ecd764
parent ae81c16854 8b1cc1582a
20 changed files with 111 additions and 72 deletions
--- a/include/kernel-6.1
+++ b/include/kernel-6.1
@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .46
-LINUX_KERNEL_HASH-6.1.46 = f5f67bcfccd47f8d9db2d5ba24e33af7778f40a777577d1fba424f4a1712a296
+LINUX_VERSION-6.1 = .47
+LINUX_KERNEL_HASH-6.1.47 = 93d58b6af007a5f44dd26831ff310707deb1ab9380c5136a534287eb3fddfcab
--- a/include/prereq.mk
+++ b/include/prereq.mk
@ -107,16 +107,9 @@ define SetupHostCommand
 			bin="$$$$$$$$(command -v "$$$$$$$${cmd%% *}")"; \
 			if [ -x "$$$$$$$$bin" ] && eval "$$$$$$$$cmd" >/dev/null 2>/dev/null; then \
 				case "$$$$$$$$(ls -dl -- $(STAGING_DIR_HOST)/bin/$(strip $(1)))" in \
-					*" -> $$$$$$$$bin"*) \
-						[ -x "$(STAGING_DIR_HOST)/bin/$(strip $(1))" ] && exit 0 \
-						;; \
-					"-"*) \
-						find "$(STAGING_DIR_HOST)/stamp" | grep $(strip $(1)) && \
-						[ -x "$(STAGING_DIR_HOST)/bin/$(strip $(1))" ] && exit 0 \
-						;; \
-					*" -> /"*) \
-						;; \
-					*" -> "*) \
+					"-"* | \
+					*" -> $$$$$$$$bin"* | \
+					*" -> "[!/]*) \
 						[ -x "$(STAGING_DIR_HOST)/bin/$(strip $(1))" ] && exit 0 \
 						;; \
 				esac; \
--- a/package/boot/arm-trusted-firmware-mvebu/Makefile
+++ b/package/boot/arm-trusted-firmware-mvebu/Makefile
@ -7,9 +7,9 @@

 include $(TOPDIR)/rules.mk

-PKG_VERSION:=2.7
-PKG_RELEASE:=6
-PKG_HASH:=53422dc649153838e03820330ba17cb10afe3e330ecde0db11e4d5f1361a33e6
+PKG_VERSION:=2.9
+PKG_RELEASE:=1
+PKG_HASH:=76a66a1de0c01aeb83dfc7b72b51173fe62c6e51d6fca17cc562393117bed08b

 PKG_MAINTAINER:=Vladimir Vid <vladimir.vid@sartura.hr>

@ -123,7 +123,7 @@ TFA_MAKE_FLAGS += \
 		BL33=$(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot.bin \
 		MV_DDR_PATH=$(BUILD_DIR)/$(MV_DDR_NAME) \
 		WTP=$(BUILD_DIR)/$(A3700_UTILS_NAME) \
-		WTMI_IMG=$(BUILD_DIR)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE)/wtmi_app.bin \
+		WTMI_IMG=$(BUILD_DIR)/$(MOX_BB_NAME)/wtmi_app.bin \
 		CRYPTOPP_PATH=$(BUILD_DIR)/$(CRYPTOPP_NAME) \
 		HOST_LDFLAGS="$(HOST_LDFLAGS)" \
 		HOST_CPPFLAGS="$(HOST_CPPFLAGS)" \
@ -138,56 +138,60 @@ TFA_MAKE_FLAGS += \
 		mrvl_uart

 A3700_UTILS_NAME:=a3700-utils
-A3700_UTILS_RELEASE:=1d977157
+A3700_UTILS_RELEASE:=a3e1c67
 A3700_UTILS_SOURCE=$(A3700_UTILS_NAME)-$(A3700_UTILS_RELEASE).tar.bz2

 define Download/a3700-utils
  FILE:=$(A3700_UTILS_SOURCE)
  PROTO:=git
  URL:=https://github.com/MarvellEmbeddedProcessors/A3700-utils-marvell.git
-  VERSION:=1d977157e37151b272f88f2406a245c833fb2d8c
-  MIRROR_HASH:=322821ec8c04afea260254e927c59cd1ec0bd84e7ec6507cc1f155f18afb8eb9
+  VERSION:=a3e1c67bb378e1d8a938e1b826cb602af83628d2
+  MIRROR_HASH:=0e6b8ef6423dcb52a5e282669a8aeebc6eea2d45a7c3a2c9a2fc7a749b3275a7
  SUBDIR:=$(A3700_UTILS_NAME)
 endef

 CRYPTOPP_NAME:=cryptopp
-CRYPTOPP_RELEASE:=f210224
+CRYPTOPP_RELEASE:=4d0cad5
 CRYPTOPP_SOURCE=$(CRYPTOPP_NAME)-$(CRYPTOPP_RELEASE).tar.bz2

 define Download/cryptopp
  FILE:=$(CRYPTOPP_SOURCE)
  PROTO:=git
  URL:=https://github.com/weidai11/cryptopp.git
-  VERSION:=f2102243e6fdd48c0b2a393a0993cca228f20573
+  VERSION:=4d0cad5401d1a2c998b314bc89288c9620d3021d
  MIRROR_HASH:=74ec9e48ee04b9f2d9a1d8c4f2392ed0ab52780d7af0f70405d7bbb23d1504fa
  SUBDIR:=$(CRYPTOPP_NAME)
 endef

 MV_DDR_NAME:=mv-ddr-marvell
-MV_DDR_RELEASE:=d5acc10c
+MV_DDR_RELEASE:=541616b
 MV_DDR_SOURCE:=$(MV_DDR_NAME)-$(MV_DDR_RELEASE).tar.bz2

 define Download/mv-ddr-marvell
  FILE:=$(MV_DDR_SOURCE)
  PROTO:=git
  URL:=https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell.git
-  VERSION:=d5acc10c287e40cc2feeb28710b92e45c93c702c
-  MIRROR_HASH:=c149ab737935b5fb822f48da8e2d7fba4388f48e645f9f6da857bee20f0333ea
+  VERSION:=541616bc5d25a0167c9901546255c55973e2c0f0
+  MIRROR_HASH:=9e86a986c7400ed1a72165a88150b6c494ebd87303b16314b43e5785e3f13068
  SUBDIR:=$(MV_DDR_NAME)
 endef

 MOX_BB_NAME:=mox-boot-builder
-MOX_BB_RELEASE:=v2022.06.11
+MOX_BB_RELEASE:=604f8f51
 MOX_BB_SOURCE:=$(MOX_BB_NAME)-$(MOX_BB_RELEASE).tar.bz2

 define Download/mox-boot-builder
  FILE:=$(MOX_BB_SOURCE)
-  URL:=https://gitlab.nic.cz/turris/mox-boot-builder/-/archive/$(MOX_BB_RELEASE)
-  HASH:=75e7661c38f4f5e6d8910dd789d6d9ffd8652455548b68c98e5bf45eaab5b6eb
+  PROTO:=git
+  SUBMODULES:=skip
+  URL:=https://gitlab.nic.cz/turris/mox-boot-builder.git
+  VERSION:=604f8f51d97b4e59fa6d1e579101daa194d6ed2d
+  MIRROR_HASH:=b09337a7dde140f57e40133b6e7b7e1eb338e7cea9b15a3af6874824462f15f7
+  SUBDIR:=$(MOX_BB_NAME)
 endef

-CM3_GCC_NAME:=gcc-arm
-CM3_GCC_RELEASE:=11.2-2022.02
+CM3_GCC_NAME:=arm-gnu-toolchain
+CM3_GCC_RELEASE:=12.3.rel1
 CM3_GCC_VERSION:=$(HOST_ARCH)-arm-none-eabi
 CM3_GCC_SOURCE=$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION).tar.xz

@ -195,9 +199,9 @@ define Download/cm3-gcc
  FILE:=$(CM3_GCC_SOURCE)
  URL:=https://developer.arm.com/-/media/Files/downloads/gnu/$(CM3_GCC_RELEASE)/binrel
 ifeq ($(HOST_ARCH),aarch64)
-  HASH:=ef1d82e5894e3908cb7ed49c5485b5b95deefa32872f79c2b5f6f5447cabf55f
+  HASH:=14c0487d5753f6071d24e568881f7c7e67f80dd83165dec5164b3731394af431
 else
-  HASH:=8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326
+  HASH:=12a2815644318ebcceaf84beabb665d0924b6e79e21048452c5331a56332b309
 endif
 endef

@ -206,7 +210,7 @@ define Build/Clean
 		$(BUILD_DIR)/$(CRYPTOPP_NAME) \
 		$(BUILD_DIR)/$(A3700_UTILS_NAME) \
 		$(BUILD_DIR)/$(MV_DDR_NAME) \
-		$(BUILD_DIR)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE) \
+		$(BUILD_DIR)/$(MOX_BB_NAME) \
 		$(BUILD_DIR)/$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION)
 endef

@ -226,7 +230,7 @@ define Build/Prepare
 	$(TAR) -C $(BUILD_DIR) -xf $(DL_DIR)/$(MV_DDR_SOURCE)
 	$(call PatchDir/Default,$(BUILD_DIR)/$(MV_DDR_NAME),./patches-mv-ddr-marvell)
 	$(TAR) -C $(BUILD_DIR) -xf $(DL_DIR)/$(MOX_BB_SOURCE)
-	$(call PatchDir/Default,$(BUILD_DIR)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE),./patches-mox-boot-builder)
+	$(call PatchDir/Default,$(BUILD_DIR)/$(MOX_BB_NAME),./patches-mox-boot-builder)
 	$(TAR) -C $(BUILD_DIR) -xf $(DL_DIR)/$(CM3_GCC_SOURCE)
 endef

@ -235,7 +239,7 @@ define Build/Compile
 		CROSS_CM3=$(BUILD_DIR)/$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION)/bin/arm-none-eabi- \
 		WTMI_VERSION=$(MOX_BB_RELEASE) \
 		CRYPTOPP_PATH=$PWD/cryptopp/ \
-		-C $(BUILD_DIR)/$(MOX_BB_NAME)-$(MOX_BB_RELEASE) \
+		-C $(BUILD_DIR)/$(MOX_BB_NAME) \
 		wtmi_app.bin
 	$(call Build/Compile/Default)
 endef
--- a/package/boot/uboot-envtools/Makefile
+++ b/package/boot/uboot-envtools/Makefile
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=uboot-envtools
 PKG_DISTNAME:=u-boot
 PKG_VERSION:=2023.07.02
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:= \
@ -45,18 +45,19 @@ define Package/uboot-envtools/description
 endef

 define Build/Configure
-	touch $(PKG_BUILD_DIR)/include/config.h
-	mkdir -p $(PKG_BUILD_DIR)/include/config
-	touch $(PKG_BUILD_DIR)/include/config/auto.conf
-	mkdir -p $(PKG_BUILD_DIR)/include/generated
-	touch $(PKG_BUILD_DIR)/include/generated/autoconf.h
+	$(call Build/Compile/Default,tools-only_defconfig)
 endef

+define Build/Compile
+	$(call Build/Compile/Default,envtools)
+endef
+
+# We need to override the ARCH passed by buildsystem as otherwise the defconfig
+# for tools-only wont match and the includes for sandbox will be dropped
 MAKE_FLAGS += \
+	ARCH="sandbox" \
 	TARGET_CFLAGS="$(TARGET_CFLAGS)" \
-	TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
-	no-dot-config-targets=envtools \
-	envtools
+	TARGET_LDFLAGS="$(TARGET_LDFLAGS)"

 define Package/uboot-envtools/conffiles
 /etc/config/ubootenv
--- a/package/kernel/linux/modules/virt.mk
+++ b/package/kernel/linux/modules/virt.mk
@ -117,3 +117,27 @@ define KernelPackage/vfio-pci/description
 endef

 $(eval $(call KernelPackage,vfio-pci))
+
+
+define KernelPackage/vhost
+  SUBMENU:=Virtualization
+  TITLE:=Host kernel accelerator for virtio (base)
+  KCONFIG:=CONFIG_VHOST
+  FILES:=$(LINUX_DIR)/drivers/vhost/vhost.ko \
+    $(LINUX_DIR)/drivers/vhost/vhost_iotlb.ko
+  AUTOLOAD:=$(call AutoProbe,vhost vhost_iotlb)
+endef
+
+$(eval $(call KernelPackage,vhost))
+
+
+define KernelPackage/vhost-net
+  SUBMENU:=Virtualization
+  TITLE:=Host kernel accelerator for virtio-net
+  DEPENDS:=+kmod-tun +kmod-vhost
+  KCONFIG:=CONFIG_VHOST_NET
+  FILES:=$(LINUX_DIR)/drivers/vhost/vhost_net.ko
+  AUTOLOAD:=$(call AutoProbe,vhost_net)
+endef
+
+$(eval $(call KernelPackage,vhost-net))
--- a/package/kernel/mac80211/ath.mk
+++ b/package/kernel/mac80211/ath.mk
@ -98,7 +98,7 @@ define KernelPackage/ath/config
 		bool "Atheros wireless debugging"
 		help
 		  Say Y, if you want to debug atheros wireless drivers.
-		  Only ath9k & ath10k make use of this.
+		  Only ath9k & ath10k & ath11k make use of this.

 	config PACKAGE_ATH_DFS
 		bool "Enable DFS support"
--- a/package/kernel/mt76/Makefile
+++ b/package/kernel/mt76/Makefile
@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=

 PKG_SOURCE_URL:=https://github.com/openwrt/mt76
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2023-07-26
-PKG_SOURCE_VERSION:=cd3dfe39276905307cc028ac8edf2c06963cda23
-PKG_MIRROR_HASH:=413d2d0faa81d834ba13cb9e503e1e3a61e3e071014da6b525a123e5da053f90
+PKG_SOURCE_DATE:=2023-08-14
+PKG_SOURCE_VERSION:=b14c2351ddb8601c322576d84029e463d456caef
+PKG_MIRROR_HASH:=62b5e157ad525424b6857e77ed373e8d39d03af71b057f8b309d8b293d6eac5f

 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_USE_NINJA:=0
@ -262,18 +262,34 @@ define KernelPackage/mt7921-firmware
  TITLE:=MediaTek MT7921 firmware
 endef

+define KernelPackage/mt792x-common
+  $(KernelPackage/mt76-default)
+  TITLE:=MediaTek MT792x wireless driver common code
+  HIDDEN:=1
+  DEPENDS+=+kmod-mt76-connac +@DRIVER_11AX_SUPPORT
+  FILES:= $(PKG_BUILD_DIR)/mt792x-lib.ko
+endef
+
+define KernelPackage/mt792x-usb
+  $(KernelPackage/mt76-default)
+  TITLE:=MediaTek MT792x wireless driver USB code
+  HIDDEN:=1
+  DEPENDS+=+kmod-mt792x-common +kmod-mt76-usb +@DRIVER_11AX_SUPPORT
+  FILES:= $(PKG_BUILD_DIR)/mt792x-usb.ko
+endef
+
 define KernelPackage/mt7921-common
  $(KernelPackage/mt76-default)
-  TITLE:=MediaTek MT7615 wireless driver common code
+  TITLE:=MediaTek MT7921 wireless driver common code
  HIDDEN:=1
-  DEPENDS+=+kmod-mt76-connac +kmod-mt7921-firmware +@DRIVER_11AX_SUPPORT +kmod-hwmon-core
+  DEPENDS+=+kmod-mt792x-common +kmod-mt7921-firmware +@DRIVER_11AX_SUPPORT +kmod-hwmon-core
  FILES:= $(PKG_BUILD_DIR)/mt7921/mt7921-common.ko
 endef

 define KernelPackage/mt7921u
  $(KernelPackage/mt76-default)
  TITLE:=MediaTek MT7921U wireless driver
-  DEPENDS+=+kmod-mt76-usb +kmod-mt7921-common
+  DEPENDS+=+kmod-mt792x-usb +kmod-mt7921-common
  FILES:= $(PKG_BUILD_DIR)/mt7921/mt7921u.ko
  AUTOLOAD:=$(call AutoProbe,mt7921u)
 endef
@ -384,6 +400,12 @@ ifdef CONFIG_PACKAGE_kmod-mt7915e
    NOSTDINC_FLAGS += -DCONFIG_MT798X_WMAC
  endif
 endif
+ifdef CONFIG_PACKAGE_kmod-mt792x-common
+  PKG_MAKE_FLAGS += CONFIG_MT792x_LIB=m
+endif
+ifdef CONFIG_PACKAGE_kmod-mt792x-usb
+  PKG_MAKE_FLAGS += CONFIG_MT792x_USB=m
+endif
 ifdef CONFIG_PACKAGE_kmod-mt7921-common
  PKG_MAKE_FLAGS += CONFIG_MT7921_COMMON=m
 endif
@ -566,6 +588,8 @@ $(eval $(call KernelPackage,mt7916-firmware))
 $(eval $(call KernelPackage,mt7981-firmware))
 $(eval $(call KernelPackage,mt7986-firmware))
 $(eval $(call KernelPackage,mt7921-firmware))
+$(eval $(call KernelPackage,mt792x-common))
+$(eval $(call KernelPackage,mt792x-usb))
 $(eval $(call KernelPackage,mt7921-common))
 $(eval $(call KernelPackage,mt7921u))
 $(eval $(call KernelPackage,mt7921s))
--- a/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch
@ -266,7 +266,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 static inline int mmc_blk_part_switch(struct mmc_card *card,
 				      unsigned int part_type);
 static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
-@@ -2969,6 +2976,8 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2970,6 +2977,8 @@ static int mmc_blk_probe(struct mmc_card
 {
 	struct mmc_blk_data *md;
 	int ret = 0;
@ -275,7 +275,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
 	/*
 	 * Check that the card supports the command class(es) we need.
-@@ -2976,7 +2985,16 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2977,7 +2986,16 @@ static int mmc_blk_probe(struct mmc_card
 	if (!(card->csd.cmdclass & CCC_BLOCK_READ))
 		return -ENODEV;
 
@ -293,7 +293,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
 	card->complete_wq = alloc_workqueue("mmc_complete",
 					WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
-@@ -2991,6 +3009,17 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2992,6 +3010,17 @@ static int mmc_blk_probe(struct mmc_card
 		goto out_free;
 	}
 
--- a/target/linux/bcm27xx/patches-6.1/950-0286-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0286-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch
@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
 		return;
 
 	val = bcm_phy_read_shadow(phydev, BCM54XX_SHD_SCR3);
-@@ -894,7 +895,7 @@ static struct phy_driver broadcom_driver
+@@ -905,7 +906,7 @@ static struct phy_driver broadcom_driver
 	.link_change_notify	= bcm54xx_link_change_notify,
 }, {
 	.phy_id		= PHY_ID_BCM54210E,
@ -35,7 +35,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
 	.name		= "Broadcom BCM54210E",
 	/* PHY_GBIT_FEATURES */
 	.get_sset_count	= bcm_phy_get_sset_count,
-@@ -908,6 +909,13 @@ static struct phy_driver broadcom_driver
+@@ -919,6 +920,13 @@ static struct phy_driver broadcom_driver
 	.suspend	= bcm54xx_suspend,
 	.resume		= bcm54xx_resume,
 }, {
@ -49,7 +49,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
 	.phy_id		= PHY_ID_BCM5461,
 	.phy_id_mask	= 0xfffffff0,
 	.name		= "Broadcom BCM5461",
-@@ -1142,7 +1150,8 @@ module_phy_driver(broadcom_drivers);
+@@ -1155,7 +1163,8 @@ module_phy_driver(broadcom_drivers);
 static struct mdio_device_id __maybe_unused broadcom_tbl[] = {
 	{ PHY_ID_BCM5411, 0xfffffff0 },
 	{ PHY_ID_BCM5421, 0xfffffff0 },
--- a/target/linux/bcm27xx/patches-6.1/950-0427-Populate-phy-driver-block-for-BCM54213PE.patch
+++ b/target/linux/bcm27xx/patches-6.1/950-0427-Populate-phy-driver-block-for-BCM54213PE.patch
@ -16,7 +16,7 @@ Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com>

 --- a/drivers/net/phy/broadcom.c
 +++ b/drivers/net/phy/broadcom.c
-@@ -921,8 +921,14 @@ static struct phy_driver broadcom_driver
+@@ -932,8 +932,14 @@ static struct phy_driver broadcom_driver
 	.phy_id_mask	= 0xffffffff,
 	.name		= "Broadcom BCM54213PE",
 	/* PHY_GBIT_FEATURES */
--- a/target/linux/generic/backport-6.1/801-v6.4-05-net-phy-Add-a-binding-for-PHY-LEDs.patch
+++ b/target/linux/generic/backport-6.1/801-v6.4-05-net-phy-Add-a-binding-for-PHY-LEDs.patch
@ -131,7 +131,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 /**
  * fwnode_mdio_find_device - Given a fwnode, find the mdio_device
  * @fwnode: pointer to the mdio_device's fwnode
-@@ -3107,6 +3178,11 @@ static int phy_probe(struct device *dev)
+@@ -3109,6 +3180,11 @@ static int phy_probe(struct device *dev)
 	/* Set the state to READY by default */
 	phydev->state = PHY_READY;
 
--- a/target/linux/generic/backport-6.1/820-v6.4-net-phy-fix-circular-LEDS_CLASS-dependencies.patch
+++ b/target/linux/generic/backport-6.1/820-v6.4-net-phy-fix-circular-LEDS_CLASS-dependencies.patch
@ -53,7 +53,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 	tristate "MDIO Bus/PHY emulation with fixed speed/link PHYs"
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
-@@ -3208,7 +3208,8 @@ static int phy_probe(struct device *dev)
+@@ -3210,7 +3210,8 @@ static int phy_probe(struct device *dev)
 	/* Get the LEDs from the device tree, and instantiate standard
 	 * LEDs for them.
 	 */
--- a/target/linux/generic/backport-6.1/822-v6.4-net-phy-Manual-remove-LEDs-to-ensure-correct-orderin.patch
+++ b/target/linux/generic/backport-6.1/822-v6.4-net-phy-Manual-remove-LEDs-to-ensure-correct-orderin.patch
@ -55,7 +55,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 			return err;
 		}
 	}
-@@ -3229,6 +3239,9 @@ static int phy_remove(struct device *dev
+@@ -3231,6 +3241,9 @@ static int phy_remove(struct device *dev
 
 	cancel_delayed_work_sync(&phydev->state_queue);
 
--- a/target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
+++ b/target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
@ -9,7 +9,7 @@ Subject: [PATCH] net/dsa/mv88e6xxx: disable ATU violation

 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -3472,6 +3472,9 @@ static int mv88e6xxx_setup_port(struct m
+@@ -3480,6 +3480,9 @@ static int mv88e6xxx_setup_port(struct m
 	else
 		reg = 1 << port;
 
--- a/target/linux/generic/pending-6.1/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch
+++ b/target/linux/generic/pending-6.1/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch
@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>

 --- a/drivers/net/dsa/mv88e6xxx/chip.c
 +++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -6980,6 +6980,7 @@ static int mv88e6xxx_register_switch(str
+@@ -6988,6 +6988,7 @@ static int mv88e6xxx_register_switch(str
 	ds->ops = &mv88e6xxx_switch_ops;
 	ds->ageing_time_min = chip->info->age_time_coeff;
 	ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;
--- a/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts
+++ b/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts
@ -115,10 +115,6 @@
 		mediatek,bmt-max-ratio = <1>;
 		mediatek,bmt-max-reserved-blocks = <64>;

-		mediatek,bmt-remap-range =
-			<0x0 0x580000>,
-			<0xef00000 0xef80000>;
-
 		partitions {
 			compatible = "fixed-partitions";
 			#address-cells = <1>;
--- a/target/linux/mediatek/patches-6.1/500-gsw-rtl8367s-mt7622-support.patch
+++ b/target/linux/mediatek/patches-6.1/500-gsw-rtl8367s-mt7622-support.patch
@ -1,6 +1,6 @@
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -382,6 +382,12 @@ config ROCKCHIP_PHY
+@@ -389,6 +389,12 @@ config ROCKCHIP_PHY
 	help
 	  Currently supports the integrated Ethernet PHY.
 
--- a/target/linux/mediatek/patches-6.1/730-v6.5-net-phy-add-driver-for-MediaTek-SoC-built-in-GE-PHYs.patch
+++ b/target/linux/mediatek/patches-6.1/730-v6.5-net-phy-add-driver-for-MediaTek-SoC-built-in-GE-PHYs.patch
@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 L:	linux-i2c@vger.kernel.org
 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -307,6 +307,18 @@ config MEDIATEK_GE_PHY
+@@ -314,6 +314,18 @@ config MEDIATEK_GE_PHY
 	help
 	  Supports the MediaTek Gigabit Ethernet PHYs.
 
--- a/target/linux/mediatek/patches-6.1/733-net-phy-add-driver-for-MediaTek-2.5G-PHY.patch
+++ b/target/linux/mediatek/patches-6.1/733-net-phy-add-driver-for-MediaTek-2.5G-PHY.patch
@ -13,7 +13,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>

 --- a/drivers/net/phy/Kconfig
 +++ b/drivers/net/phy/Kconfig
-@@ -319,6 +319,13 @@ config MEDIATEK_GE_SOC_PHY
+@@ -326,6 +326,13 @@ config MEDIATEK_GE_SOC_PHY
 	  present in the SoCs efuse and will dynamically calibrate VCM
 	  (common-mode voltage) during startup.
 
--- a/target/linux/x86/generic/config-5.15
+++ b/target/linux/x86/generic/config-5.15
@ -399,9 +399,6 @@ CONFIG_TREE_SRCU=y
 CONFIG_UCS2_STRING=y
 CONFIG_USB_STORAGE=y
 CONFIG_USER_RETURN_NOTIFIER=y
-CONFIG_VHOST=y
-CONFIG_VHOST_IOTLB=y
-CONFIG_VHOST_NET=y
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_BALLOON=y
 CONFIG_VIRTIO_BLK=y