diff --git a/include/netfilter.mk b/include/netfilter.mk
index 1b7224bc8c..a6d6dd75b8 100644
--- a/include/netfilter.mk
+++ b/include/netfilter.mk
@@ -131,9 +131,6 @@ $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_HL, $(P_XT)xt_HL))
# iprange
$(eval $(call nf_add,IPT_IPRANGE,CONFIG_NETFILTER_XT_MATCH_IPRANGE, $(P_XT)xt_iprange))
-#clusterip
-$(eval $(call nf_add,IPT_CLUSTERIP,CONFIG_IP_NF_TARGET_CLUSTERIP, $(P_V4)ipt_CLUSTERIP))
-
# ipsec
$(eval $(call nf_add,IPT_IPSEC,CONFIG_IP_NF_MATCH_AH, $(P_V4)ipt_ah))
$(eval $(call nf_add,IPT_IPSEC,CONFIG_NETFILTER_XT_MATCH_ESP, $(P_XT)xt_esp))
@@ -371,7 +368,6 @@ IPT_BUILTIN += $(IPT_FLOW-y) $(IPT_FLOW-m)
IPT_BUILTIN += $(IPT_IPOPT-y)
IPT_BUILTIN += $(IPT_IPRANGE-y)
IPT_BUILTIN += $(IPT_CLUSTER-y)
-IPT_BUILTIN += $(IPT_CLUSTERIP-y)
IPT_BUILTIN += $(IPT_IPSEC-y)
IPT_BUILTIN += $(IPT_IPV6-y) $(IPT_IPV6-m)
IPT_BUILTIN += $(NF_NAT-y)
diff --git a/package/kernel/linux/modules/can.mk b/package/kernel/linux/modules/can.mk
index 603976ef5f..c86d02d8de 100644
--- a/package/kernel/linux/modules/can.mk
+++ b/package/kernel/linux/modules/can.mk
@@ -120,9 +120,7 @@ $(eval $(call KernelPackage,can-c-can-platform))
define KernelPackage/can-flexcan
TITLE:=Support for Freescale FLEXCAN based chips
KCONFIG:=CONFIG_CAN_FLEXCAN
- FILES:= \
- $(LINUX_DIR)/drivers/net/can/flexcan.ko@lt5.17 \
- $(LINUX_DIR)/drivers/net/can/flexcan/flexcan.ko@ge5.17
+ FILES:=$(LINUX_DIR)/drivers/net/can/flexcan/flexcan.ko
AUTOLOAD:=$(call AutoProbe,flexcan)
$(call AddDepends/can,@TARGET_imx)
endef
@@ -185,9 +183,7 @@ $(eval $(call KernelPackage,can-raw))
define KernelPackage/can-slcan
TITLE:=Serial / USB serial CAN Adaptors (slcan)
KCONFIG:=CONFIG_CAN_SLCAN
- FILES:= \
- $(LINUX_DIR)/drivers/net/can/slcan.ko@lt6.0 \
- $(LINUX_DIR)/drivers/net/can/slcan/slcan.ko@ge6.0
+ FILES:=$(LINUX_DIR)/drivers/net/can/slcan/slcan.ko
AUTOLOAD:=$(call AutoProbe,slcan)
$(call AddDepends/can)
endef
@@ -235,12 +231,8 @@ $(eval $(call KernelPackage,can-usb-ems))
define KernelPackage/can-usb-esd
TITLE:=ESD USB/2 CAN/USB interface
- KCONFIG:= \
- CONFIG_CAN_ESD_USB2@lt6.0 \
- CONFIG_CAN_ESD_USB@ge6.0
- FILES:= \
- $(LINUX_DIR)/drivers/net/can/usb/esd_usb2.ko@lt6.0 \
- $(LINUX_DIR)/drivers/net/can/usb/esd_usb.ko@ge6.0
+ KCONFIG:=CONFIG_CAN_ESD_USB
+ FILES:=$(LINUX_DIR)/drivers/net/can/usb/esd_usb.ko
AUTOLOAD:=$(call AutoProbe,esd_usb2 esd_usb)
$(call AddDepends/can,+kmod-usb-core)
endef
diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
index 43330bf064..ce22163547 100644
--- a/package/kernel/linux/modules/crypto.mk
+++ b/package/kernel/linux/modules/crypto.mk
@@ -39,11 +39,8 @@ define KernelPackage/crypto-aead
TITLE:=CryptoAPI AEAD support
KCONFIG:= \
CONFIG_CRYPTO_AEAD \
- CONFIG_CRYPTO_AEAD2 \
- CONFIG_CRYPTO_GENIV@lt6.6
- FILES:= \
- $(LINUX_DIR)/crypto/aead.ko \
- $(LINUX_DIR)/crypto/geniv.ko@lt6.6
+ CONFIG_CRYPTO_AEAD2
+ FILES:=$(LINUX_DIR)/crypto/aead.ko
AUTOLOAD:=$(call AutoLoad,09,aead,1)
$(call AddDepends/crypto, +kmod-crypto-null)
endef
@@ -243,7 +240,7 @@ $(eval $(call KernelPackage,crypto-ecdh))
define KernelPackage/crypto-echainiv
TITLE:=Encrypted Chain IV Generator
- DEPENDS:=+kmod-crypto-aead +LINUX_6_6:kmod-crypto-geniv
+ DEPENDS:=+kmod-crypto-aead +kmod-crypto-geniv
KCONFIG:=CONFIG_CRYPTO_ECHAINIV
FILES:=$(LINUX_DIR)/crypto/echainiv.ko
AUTOLOAD:=$(call AutoLoad,09,echainiv)
@@ -305,9 +302,7 @@ define KernelPackage/crypto-gf128
KCONFIG:= \
CONFIG_CRYPTO_GF128MUL \
CONFIG_CRYPTO_LIB_GF128MUL
- FILES:= \
- $(LINUX_DIR)/crypto/gf128mul.ko@lt6.2 \
- $(LINUX_DIR)/lib/crypto/gf128mul.ko@ge6.2
+ FILES:=$(LINUX_DIR)/lib/crypto/gf128mul.ko
AUTOLOAD:=$(call AutoLoad,09,gf128mul)
$(call AddDepends/crypto)
endef
@@ -863,8 +858,7 @@ define KernelPackage/crypto-rsa
KCONFIG:= CONFIG_CRYPTO_RSA
HIDDEN:=1
FILES:= \
- $(LINUX_DIR)/lib/mpi/mpi.ko@lt6.5 \
- $(LINUX_DIR)/lib/crypto/mpi/mpi.ko@ge6.5 \
+ $(LINUX_DIR)/lib/crypto/mpi/mpi.ko \
$(LINUX_DIR)/crypto/akcipher.ko \
$(LINUX_DIR)/crypto/rsa_generic.ko
AUTOLOAD:=$(call AutoLoad,10,rsa_generic)
@@ -888,7 +882,7 @@ $(eval $(call KernelPackage,crypto-rmd160))
define KernelPackage/crypto-rng
TITLE:=CryptoAPI random number generation
- DEPENDS:=+kmod-crypto-hash +kmod-crypto-hmac +kmod-crypto-sha512 +LINUX_6_6:kmod-crypto-sha3
+ DEPENDS:=+kmod-crypto-hash +kmod-crypto-hmac +kmod-crypto-sha512 +kmod-crypto-sha3
KCONFIG:= \
CONFIG_CRYPTO_DRBG \
CONFIG_CRYPTO_DRBG_HMAC=y \
@@ -910,7 +904,7 @@ $(eval $(call KernelPackage,crypto-rng))
define KernelPackage/crypto-geniv
TITLE:=CryptoAPI Shared IV generator
HIDDEN:=1
- DEPENDS:=+kmod-crypto-rng +kmod-crypto-aead @LINUX_6_6
+ DEPENDS:=+kmod-crypto-rng +kmod-crypto-aead
KCONFIG:=CONFIG_CRYPTO_GENIV
FILES:=$(LINUX_DIR)/crypto/geniv.ko
AUTOLOAD:=$(call AutoLoad,09,geniv)
@@ -922,7 +916,7 @@ $(eval $(call KernelPackage,crypto-geniv))
define KernelPackage/crypto-seqiv
TITLE:=CryptoAPI Sequence Number IV Generator
- DEPENDS:=+kmod-crypto-aead +kmod-crypto-rng +LINUX_6_6:kmod-crypto-geniv
+ DEPENDS:=+kmod-crypto-aead +kmod-crypto-rng +kmod-crypto-geniv
KCONFIG:=CONFIG_CRYPTO_SEQIV
FILES:=$(LINUX_DIR)/crypto/seqiv.ko
AUTOLOAD:=$(call AutoLoad,09,seqiv)
@@ -1137,7 +1131,7 @@ $(eval $(call KernelPackage,crypto-test))
define KernelPackage/crypto-user
TITLE:=CryptoAPI userspace interface
- DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager +LINUX_6_6:kmod-crypto-rng
+ DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager +kmod-crypto-rng
KCONFIG:= \
CONFIG_CRYPTO_USER \
CONFIG_CRYPTO_USER_API \
diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk
index 7d3180febf..6d96f53915 100644
--- a/package/kernel/linux/modules/fs.mk
+++ b/package/kernel/linux/modules/fs.mk
@@ -87,7 +87,7 @@ define KernelPackage/fs-smbfs-common
SUBMENU:=$(FS_MENU)
TITLE:=SMBFS common dependencies support
HIDDEN:=1
- DEPENDS:=+LINUX_6_6:kmod-fs-netfs +LINUX_6_6:kmod-nls-ucs2-utils
+ DEPENDS:=+kmod-fs-netfs +kmod-nls-ucs2-utils
KCONFIG:=\
CONFIG_SMBFS
FILES:= \
@@ -272,8 +272,8 @@ define KernelPackage/fs-fscache
CONFIG_CACHEFILES \
CONFIG_CACHEFILES_DEBUG=n \
CONFIG_CACHEFILES_HISTOGRAM=n \
- CONFIG_CACHEFILES_ERROR_INJECTION=n@ge5.17 \
- CONFIG_CACHEFILES_ONDEMAND=n@ge5.19
+ CONFIG_CACHEFILES_ERROR_INJECTION=n \
+ CONFIG_CACHEFILES_ONDEMAND=n
FILES:= \
$(LINUX_DIR)/fs/fscache/fscache.ko \
$(LINUX_DIR)/fs/cachefiles/cachefiles.ko
@@ -340,7 +340,7 @@ define KernelPackage/fs-jfs
KCONFIG:=CONFIG_JFS_FS
FILES:=$(LINUX_DIR)/fs/jfs/jfs.ko
AUTOLOAD:=$(call AutoLoad,30,jfs,1)
- DEPENDS:=+LINUX_6_6:kmod-nls-ucs2-utils
+ DEPENDS:=+kmod-nls-ucs2-utils
$(call AddDepends/nls)
endef
@@ -708,7 +708,7 @@ define KernelPackage/pstore
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
FILES:= $(LINUX_DIR)/fs/pstore/pstore.ko
AUTOLOAD:=$(call AutoLoad,30,pstore,1)
- DEPENDS:=+LINUX_6_6:kmod-lib-zlib-deflate +LINUX_6_6:kmod-lib-zlib-inflate
+ DEPENDS:=+kmod-lib-zlib-deflate +kmod-lib-zlib-inflate
endef
define KernelPackage/pstore/description
diff --git a/package/kernel/linux/modules/hwmon.mk b/package/kernel/linux/modules/hwmon.mk
index dc921f8fca..ae9b35114b 100644
--- a/package/kernel/linux/modules/hwmon.mk
+++ b/package/kernel/linux/modules/hwmon.mk
@@ -34,7 +34,7 @@ define KernelPackage/hwmon-ad7418
KCONFIG:=CONFIG_SENSORS_AD7418
FILES:=$(LINUX_DIR)/drivers/hwmon/ad7418.ko
AUTOLOAD:=$(call AutoLoad,60,ad7418 ad7418)
- $(call AddDepends/hwmon,+kmod-i2c-core +LINUX_6_6:kmod-regmap-core)
+ $(call AddDepends/hwmon,+kmod-i2c-core +kmod-regmap-core)
endef
define KernelPackage/hwmon-ad7418/description
diff --git a/package/kernel/linux/modules/iio.mk b/package/kernel/linux/modules/iio.mk
index 7cf0952db3..e46544b79c 100644
--- a/package/kernel/linux/modules/iio.mk
+++ b/package/kernel/linux/modules/iio.mk
@@ -383,7 +383,7 @@ $(eval $(call KernelPackage,iio-st_accel-spi))
define KernelPackage/iio-lsm6dsx
- DEPENDS:=+kmod-iio-kfifo-buf +kmod-regmap-core +LINUX_6_6:kmod-industrialio-triggered-buffer
+ DEPENDS:=+kmod-iio-kfifo-buf +kmod-regmap-core +kmod-industrialio-triggered-buffer
TITLE:=ST LSM6DSx driver for IMU MEMS sensors
KCONFIG:=CONFIG_IIO_ST_LSM6DSX
FILES:=$(LINUX_DIR)/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.ko
diff --git a/package/kernel/linux/modules/input.mk b/package/kernel/linux/modules/input.mk
index 89fba29005..4eafc7d6b1 100644
--- a/package/kernel/linux/modules/input.mk
+++ b/package/kernel/linux/modules/input.mk
@@ -179,7 +179,7 @@ $(eval $(call KernelPackage,input-touchscreen-ads7846))
define KernelPackage/input-touchscreen-edt-ft5x06
SUBMENU:=$(INPUT_MODULES_MENU)
TITLE:=EDT FT5x06 and Focaltech FT6236 based touchscreens
- DEPENDS:=+kmod-i2c-core +kmod-input-core +LINUX_6_6:kmod-regmap-i2c
+ DEPENDS:=+kmod-i2c-core +kmod-input-core +kmod-regmap-i2c
KCONFIG:= \
CONFIG_INPUT_TOUCHSCREEN=y \
CONFIG_TOUCHSCREEN_EDT_FT5X06
diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
index 6d38f51188..48c35626a8 100644
--- a/package/kernel/linux/modules/netdevices.mk
+++ b/package/kernel/linux/modules/netdevices.mk
@@ -363,7 +363,7 @@ define KernelPackage/phy-smsc
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=SMSC PHY driver
KCONFIG:=CONFIG_SMSC_PHY
- DEPENDS:=+kmod-libphy +LINUX_6_6:kmod-lib-crc16
+ DEPENDS:=+kmod-libphy +kmod-lib-crc16
FILES:=$(LINUX_DIR)/drivers/net/phy/smsc.ko
AUTOLOAD:=$(call AutoProbe,smsc)
endef
@@ -779,7 +779,7 @@ define KernelPackage/r8169
DEPENDS:=@PCI_SUPPORT +kmod-mii +r8169-firmware +kmod-phy-realtek +kmod-mdio-devres
KCONFIG:= \
CONFIG_R8169 \
- CONFIG_R8169_LEDS=y@ge6.6
+ CONFIG_R8169_LEDS=y
FILES:=$(LINUX_DIR)/drivers/net/ethernet/realtek/r8169.ko
AUTOLOAD:=$(call AutoProbe,r8169)
endef
@@ -1432,7 +1432,7 @@ $(eval $(call KernelPackage,mlx4-core))
define KernelPackage/mlx5-core
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Mellanox ConnectX(R) mlx5 core Network Driver
- DEPENDS:=@PCI_SUPPORT +kmod-ptp +kmod-mlxfw +LINUX_6_6:kmod-hwmon-core
+ DEPENDS:=@PCI_SUPPORT +kmod-ptp +kmod-mlxfw +kmod-hwmon-core
FILES:=$(LINUX_DIR)/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko
KCONFIG:= CONFIG_MLX5_CORE \
CONFIG_MLX5_CORE_EN=y \
@@ -1738,7 +1738,7 @@ define KernelPackage/wwan
TITLE:=WWAN Driver Core
KCONFIG:= \
CONFIG_WWAN \
- CONFIG_WWAN_DEBUGFS=y@ge5.17
+ CONFIG_WWAN_DEBUGFS=y
FILES:=$(LINUX_DIR)/drivers/net/wwan/wwan.ko
AUTOLOAD:=$(call AutoProbe,wwan)
endef
@@ -1834,7 +1834,7 @@ $(eval $(call KernelPackage,atlantic))
define KernelPackage/lan743x
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Microchip LAN743x PCI Express Gigabit Ethernet NIC
- DEPENDS:=@PCI_SUPPORT +kmod-ptp +kmod-mdio-devres +!LINUX_6_1:kmod-fixed-phy
+ DEPENDS:=@PCI_SUPPORT +kmod-ptp +kmod-mdio-devres +kmod-fixed-phy
KCONFIG:=CONFIG_LAN743X
FILES:=$(LINUX_DIR)/drivers/net/ethernet/microchip/lan743x.ko
AUTOLOAD:=$(call AutoProbe,lan743x)
diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
index 42c20a288f..cf66bd8cd8 100644
--- a/package/kernel/linux/modules/netfilter.mk
+++ b/package/kernel/linux/modules/netfilter.mk
@@ -818,27 +818,6 @@ endef
$(eval $(call KernelPackage,ipt-cluster))
-define KernelPackage/ipt-clusterip
- TITLE:=Module for CLUSTERIP
- KCONFIG:=$(KCONFIG_IPT_CLUSTERIP)
- FILES:=$(foreach mod,$(IPT_CLUSTERIP-m),$(LINUX_DIR)/net/$(mod).ko)
- AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_CLUSTERIP-m)))
- $(call AddDepends/ipt,+kmod-nf-conntrack @LINUX_6_1)
-endef
-
-define KernelPackage/ipt-clusterip/description
- Netfilter (IPv4-only) module for CLUSTERIP
- The CLUSTERIP target allows you to build load-balancing clusters of
- network servers without having a dedicated load-balancing
- router/server/switch.
-
- To use it also enable iptables-mod-clusterip
-
- see `iptables -j CLUSTERIP --help` for more information.
-endef
-
-$(eval $(call KernelPackage,ipt-clusterip))
-
define KernelPackage/ipt-extra
TITLE:=Extra modules
@@ -1197,15 +1176,11 @@ define KernelPackage/nft-offload
DEPENDS:=@IPV6 +kmod-nf-flow +kmod-nft-nat
KCONFIG:= \
CONFIG_NF_FLOW_TABLE_INET \
- CONFIG_NF_FLOW_TABLE_IPV4@lt5.17 \
- CONFIG_NF_FLOW_TABLE_IPV6@lt5.17 \
CONFIG_NFT_FLOW_OFFLOAD
FILES:= \
$(LINUX_DIR)/net/netfilter/nf_flow_table_inet.ko \
- $(LINUX_DIR)/net/ipv4/netfilter/nf_flow_table_ipv4.ko@lt5.17 \
- $(LINUX_DIR)/net/ipv6/netfilter/nf_flow_table_ipv6.ko@lt5.17 \
$(LINUX_DIR)/net/netfilter/nft_flow_offload.ko
- AUTOLOAD:=$(call AutoProbe,nf_flow_table_inet nf_flow_table_ipv4@lt5.17 nf_flow_table_ipv6@lt5.17 nft_flow_offload)
+ AUTOLOAD:=$(call AutoProbe,nf_flow_table_inet nft_flow_offload)
endef
$(eval $(call KernelPackage,nft-offload))
diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index 4aa7bac91d..e3c2f8dc3c 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -910,7 +910,6 @@ $(eval $(call KernelPackage,sched-ipset))
define KernelPackage/sched-mqprio-common
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=mqprio queue common dependencies support
- DEPENDS:=@LINUX_6_6
HIDDEN:=1
KCONFIG:=CONFIG_NET_SCH_MQPRIO_LIB
FILES:=$(LINUX_DIR)/net/sched/sch_mqprio_lib.ko
@@ -926,7 +925,7 @@ $(eval $(call KernelPackage,sched-mqprio-common))
define KernelPackage/sched-mqprio
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Multi-queue priority scheduler (MQPRIO)
- DEPENDS:=+kmod-sched-core +LINUX_6_6:kmod-sched-mqprio-common
+ DEPENDS:=+kmod-sched-core +kmod-sched-mqprio-common
KCONFIG:=CONFIG_NET_SCH_MQPRIO
FILES:=$(LINUX_DIR)/net/sched/sch_mqprio.ko
AUTOLOAD:=$(call AutoProbe, sch_mqprio)
@@ -1361,7 +1360,7 @@ define KernelPackage/9pnet
KCONFIG:= \
CONFIG_NET_9P \
CONFIG_NET_9P_DEBUG=n \
- CONFIG_NET_9P_FD=n@ge5.17
+ CONFIG_NET_9P_FD=n
FILES:= \
$(LINUX_DIR)/net/9p/9pnet.ko
AUTOLOAD:=$(call AutoLoad,29,9pnet)
diff --git a/package/kernel/linux/modules/nls.mk b/package/kernel/linux/modules/nls.mk
index 893ec9c23a..e4817af613 100644
--- a/package/kernel/linux/modules/nls.mk
+++ b/package/kernel/linux/modules/nls.mk
@@ -344,7 +344,6 @@ $(eval $(call KernelPackage,nls-utf8))
define KernelPackage/nls-ucs2-utils
SUBMENU:=Native Language Support
TITLE:=UCS-2 common library
- DEPENDS+=@LINUX_6_6
HIDDEN:=1
KCONFIG:=CONFIG_NLS_UCS2_UTILS
FILES:=$(LINUX_DIR)/fs/nls/nls_ucs2_utils.ko
diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index 5639d32674..6224b723ef 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -59,7 +59,7 @@ define KernelPackage/bluetooth
$(LINUX_DIR)/drivers/bluetooth/btbcm.ko \
$(LINUX_DIR)/drivers/bluetooth/btintel.ko \
$(LINUX_DIR)/drivers/bluetooth/btrtl.ko \
- $(LINUX_DIR)/drivers/bluetooth/btmtk.ko@ge5.17
+ $(LINUX_DIR)/drivers/bluetooth/btmtk.ko
AUTOLOAD:=$(call AutoProbe,bluetooth rfcomm bnep hidp hci_uart btusb)
endef
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 4ba19a4814..79ee6b65ec 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -660,7 +660,6 @@ define KernelPackage/usb-serial-ch348
KCONFIG:=CONFIG_USB_SERIAL_CH348
FILES:=$(LINUX_DIR)/drivers/usb/serial/ch348.ko
AUTOLOAD:=$(call AutoProbe,ch348)
- DEPENDS:=@LINUX_6_6
$(call AddDepends/usb-serial)
endef
@@ -1622,7 +1621,7 @@ define KernelPackage/usb-hid-mcp2221
SUBMENU:=$(USB_MENU)
TITLE:=Microchip USB 2.0 to I2C/UART Protocol Converter with GPIO
KCONFIG:=CONFIG_HID_MCP2221
- DEPENDS:=@GPIO_SUPPORT +kmod-usb-hid +kmod-i2c-core +LINUX_6_6:kmod-iio-core
+ DEPENDS:=@GPIO_SUPPORT +kmod-usb-hid +kmod-i2c-core +kmod-iio-core
FILES:=$(LINUX_DIR)/drivers/hid/hid-mcp2221.ko
AUTOLOAD:=$(call AutoProbe,hid-mcp2221)
endef
diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk
index cbc381d473..bbfb1fb7b9 100644
--- a/package/kernel/linux/modules/video.mk
+++ b/package/kernel/linux/modules/video.mk
@@ -107,7 +107,7 @@ define KernelPackage/fb
CONFIG_VT_HW_CONSOLE_BINDING=y
FILES:=$(LINUX_DIR)/drivers/video/fbdev/core/fb.ko \
$(LINUX_DIR)/lib/fonts/font.ko \
- $(LINUX_DIR)/drivers/video/fbdev/core/fb_io_fops.ko@ge6.6
+ $(LINUX_DIR)/drivers/video/fbdev/core/fb_io_fops.ko
AUTOLOAD:=$(call AutoLoad,06,fb font)
endef
@@ -320,7 +320,7 @@ define KernelPackage/drm-exec
SUBMENU:=$(VIDEO_MENU)
HIDDEN:=1
TITLE:=Execution context for command submissions
- DEPENDS:=@DISPLAY_SUPPORT +kmod-drm @LINUX_6_6
+ DEPENDS:=@DISPLAY_SUPPORT +kmod-drm
KCONFIG:=CONFIG_DRM_EXEC
FILES:=$(LINUX_DIR)/drivers/gpu/drm/drm_exec.ko
AUTOLOAD:=$(call AutoProbe,drm_exec)
@@ -397,7 +397,7 @@ define KernelPackage/drm-suballoc-helper
SUBMENU:=$(VIDEO_MENU)
HIDDEN:=1
TITLE:=DRM suballocation helper
- DEPENDS:=@DISPLAY_SUPPORT +kmod-drm @LINUX_6_6
+ DEPENDS:=@DISPLAY_SUPPORT +kmod-drm
KCONFIG:=CONFIG_DRM_SUBALLOC_HELPER
FILES:=$(LINUX_DIR)/drivers/gpu/drm/drm_suballoc_helper.ko
AUTOLOAD:=$(call AutoProbe,drm_suballoc_helper)
@@ -415,7 +415,7 @@ define KernelPackage/drm-amdgpu
DEPENDS:=@TARGET_x86||TARGET_loongarch64 @DISPLAY_SUPPORT +kmod-backlight +kmod-drm-ttm \
+kmod-drm-ttm-helper +kmod-drm-kms-helper +kmod-i2c-algo-bit +amdgpu-firmware \
+kmod-drm-display-helper +kmod-drm-buddy +kmod-acpi-video \
- +LINUX_6_6:kmod-drm-exec +LINUX_6_6:kmod-drm-suballoc-helper
+ +kmod-drm-exec +kmod-drm-suballoc-helper
KCONFIG:=CONFIG_DRM_AMDGPU \
CONFIG_DRM_AMDGPU_SI=y \
CONFIG_DRM_AMDGPU_CIK=y \
@@ -423,7 +423,7 @@ define KernelPackage/drm-amdgpu
CONFIG_DEBUG_KERNEL_DC=n
FILES:=$(LINUX_DIR)/drivers/gpu/drm/amd/amdgpu/amdgpu.ko \
$(LINUX_DIR)/drivers/gpu/drm/scheduler/gpu-sched.ko \
- $(LINUX_DIR)/drivers/gpu/drm/amd/amdxcp/amdxcp.ko@ge6.5
+ $(LINUX_DIR)/drivers/gpu/drm/amd/amdxcp/amdxcp.ko
AUTOLOAD:=$(call AutoProbe,amdgpu)
endef
@@ -460,8 +460,7 @@ define KernelPackage/drm-imx
CONFIG_DRM_IMX_LDB=n \
CONFIG_DRM_IMX_HDMI=n
FILES:= \
- $(LINUX_DIR)/drivers/gpu/drm/imx/imxdrm.ko@lt6.6 \
- $(LINUX_DIR)/drivers/gpu/drm/imx/ipuv3/imxdrm.ko@ge6.6 \
+ $(LINUX_DIR)/drivers/gpu/drm/imx/ipuv3/imxdrm.ko \
$(LINUX_DIR)/drivers/gpu/drm/drm_dma_helper.ko \
$(LINUX_DIR)/drivers/gpu/ipu-v3/imx-ipu-v3.ko
AUTOLOAD:=$(call AutoLoad,08,imxdrm imx-ipu-v3 imx-ipuv3-crtc)
@@ -483,8 +482,7 @@ define KernelPackage/drm-imx-hdmi
FILES:= \
$(LINUX_DIR)/drivers/gpu/drm/bridge/synopsys/dw-hdmi.ko \
$(LINUX_DIR)/drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.ko \
- $(LINUX_DIR)/drivers/gpu/drm/imx/dw_hdmi-imx.ko@lt6.6 \
- $(LINUX_DIR)/drivers/gpu/drm/imx/ipuv3/dw_hdmi-imx.ko@ge6.6
+ $(LINUX_DIR)/drivers/gpu/drm/imx/ipuv3/dw_hdmi-imx.ko
AUTOLOAD:=$(call AutoLoad,08,dw-hdmi dw-hdmi-ahb-audio.ko dw_hdmi-imx)
endef
@@ -508,8 +506,8 @@ define KernelPackage/drm-imx-ldb
CONFIG_DRM_PANEL_LVDS=n \
CONFIG_DRM_PANEL_S6E8AA0=n \
CONFIG_DRM_PANEL_SITRONIX_ST7789V=n
- FILES:=$(LINUX_DIR)/drivers/gpu/drm/imx/imx-ldb.ko@lt6.6 \
- $(LINUX_DIR)/drivers/gpu/drm/imx/ipuv3/imx-ldb.ko@ge6.6 \
+ FILES:= \
+ $(LINUX_DIR)/drivers/gpu/drm/imx/ipuv3/imx-ldb.ko \
$(LINUX_DIR)/drivers/gpu/drm/panel/panel-simple.ko
AUTOLOAD:=$(call AutoLoad,08,imx-ldb)
endef
@@ -584,7 +582,7 @@ define KernelPackage/drm-radeon
TITLE:=Radeon DRM support
DEPENDS:=@TARGET_x86 @DISPLAY_SUPPORT +kmod-backlight +kmod-drm-kms-helper \
+kmod-drm-ttm +kmod-drm-ttm-helper +kmod-i2c-algo-bit +radeon-firmware \
- +kmod-drm-display-helper +kmod-acpi-video +LINUX_6_6:kmod-drm-suballoc-helper
+ +kmod-drm-display-helper +kmod-acpi-video +kmod-drm-suballoc-helper
KCONFIG:=CONFIG_DRM_RADEON
FILES:=$(LINUX_DIR)/drivers/gpu/drm/radeon/radeon.ko
AUTOLOAD:=$(call AutoProbe,radeon)
@@ -699,10 +697,10 @@ $(eval $(call KernelPackage,video-pwc))
define KernelPackage/video-uvc
TITLE:=USB Video Class (UVC) support
DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-video-videobuf2 +kmod-input-core
- KCONFIG:= CONFIG_USB_VIDEO_CLASS CONFIG_UVC_COMMON@ge6.3
+ KCONFIG:= CONFIG_USB_VIDEO_CLASS CONFIG_UVC_COMMON
FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/uvc/uvcvideo.ko \
- $(LINUX_DIR)/drivers/media/common/uvc.ko@ge6.3
- AUTOLOAD:=$(call AutoProbe,uvc@ge6.3 uvcvideo)
+ $(LINUX_DIR)/drivers/media/common/uvc.ko
+ AUTOLOAD:=$(call AutoProbe,uvc uvcvideo)
$(call AddDepends/camera)
endef
diff --git a/package/kernel/linux/modules/virt.mk b/package/kernel/linux/modules/virt.mk
index 4a879f240e..9286ad489c 100644
--- a/package/kernel/linux/modules/virt.mk
+++ b/package/kernel/linux/modules/virt.mk
@@ -22,7 +22,7 @@ define KernelPackage/kvm-x86
KCONFIG:=\
CONFIG_KVM \
CONFIG_KVM_MMU_AUDIT=n \
- CONFIG_KVM_SMM=y@ge6.6 \
+ CONFIG_KVM_SMM=y \
CONFIG_VIRTUALIZATION=y
FILES:= $(LINUX_DIR)/arch/$(LINUX_KARCH)/kvm/kvm.ko
AUTOLOAD:=$(call AutoProbe,kvm.ko)
@@ -85,9 +85,8 @@ define KernelPackage/vfio
CONFIG_VFIO_MDEV=n
FILES:= \
$(LINUX_DIR)/drivers/vfio/vfio.ko \
- $(LINUX_DIR)/drivers/vfio/vfio_virqfd.ko@lt6.2 \
$(LINUX_DIR)/drivers/vfio/vfio_iommu_type1.ko
- AUTOLOAD:=$(call AutoProbe,vfio vfio_iommu_type1 +LINUX_6_1:vfio_virqfd)
+ AUTOLOAD:=$(call AutoProbe,vfio vfio_iommu_type1)
endef
define KernelPackage/vfio/description
diff --git a/package/kernel/mac80211/patches/rtl/001-v6.10-wifi-rtw88-usb-schedule-rx-work-after-everything-is-.patch b/package/kernel/mac80211/patches/rtl/001-v6.10-wifi-rtw88-usb-schedule-rx-work-after-everything-is-.patch
new file mode 100644
index 0000000000..2fa581f288
--- /dev/null
+++ b/package/kernel/mac80211/patches/rtl/001-v6.10-wifi-rtw88-usb-schedule-rx-work-after-everything-is-.patch
@@ -0,0 +1,98 @@
+From 25eaef533bf3ccc6fee5067aac16f41f280e343e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= <mslusarz@renau.com>
+Date: Tue, 28 May 2024 13:02:46 +0200
+Subject: [PATCH] wifi: rtw88: usb: schedule rx work after everything is set up
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+[ Upstream commit adc539784c98a7cc602cbf557debfc2e7b9be8b3 ]
+
+Right now it's possible to hit NULL pointer dereference in
+rtw_rx_fill_rx_status on hw object and/or its fields because
+initialization routine can start getting USB replies before
+rtw_dev is fully setup.
+
+The stack trace looks like this:
+
+rtw_rx_fill_rx_status
+rtw8821c_query_rx_desc
+rtw_usb_rx_handler
+...
+queue_work
+rtw_usb_read_port_complete
+...
+usb_submit_urb
+rtw_usb_rx_resubmit
+rtw_usb_init_rx
+rtw_usb_probe
+
+So while we do the async stuff rtw_usb_probe continues and calls
+rtw_register_hw, which does all kinds of initialization (e.g.
+via ieee80211_register_hw) that rtw_rx_fill_rx_status relies on.
+
+Fix this by moving the first usb_submit_urb after everything
+is set up.
+
+For me, this bug manifested as:
+[ 8.893177] rtw_8821cu 1-1:1.2: band wrong, packet dropped
+[ 8.910904] rtw_8821cu 1-1:1.2: hw->conf.chandef.chan NULL in rtw_rx_fill_rx_status
+because I'm using Larry's backport of rtw88 driver with the NULL
+checks in rtw_rx_fill_rx_status.
+
+Link: https://lore.kernel.org/linux-wireless/CA+shoWQ7P49jhQasofDcTdQhiuarPTjYEDa--NiVVx494WcuQw@mail.gmail.com/
+Signed-off-by: Marcin Ślusarz <mslusarz@renau.com>
+Cc: Tim K <tpkuester@gmail.com>
+Cc: Ping-Ke Shih <pkshih@realtek.com>
+Cc: Larry Finger <Larry.Finger@lwfinger.net>
+Cc: Kalle Valo <kvalo@kernel.org>
+Cc: linux-wireless@vger.kernel.org
+Cc: linux-kernel@vger.kernel.org
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/20240528110246.477321-1-marcin.slusarz@gmail.com
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/net/wireless/realtek/rtw88/usb.c | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/usb.c
++++ b/drivers/net/wireless/realtek/rtw88/usb.c
+@@ -740,7 +740,6 @@ static struct rtw_hci_ops rtw_usb_ops =
+ static int rtw_usb_init_rx(struct rtw_dev *rtwdev)
+ {
+ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev);
+- int i;
+
+ rtwusb->rxwq = create_singlethread_workqueue("rtw88_usb: rx wq");
+ if (!rtwusb->rxwq) {
+@@ -752,13 +751,19 @@ static int rtw_usb_init_rx(struct rtw_de
+
+ INIT_WORK(&rtwusb->rx_work, rtw_usb_rx_handler);
+
++ return 0;
++}
++
++static void rtw_usb_setup_rx(struct rtw_dev *rtwdev)
++{
++ struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev);
++ int i;
++
+ for (i = 0; i < RTW_USB_RXCB_NUM; i++) {
+ struct rx_usb_ctrl_block *rxcb = &rtwusb->rx_cb[i];
+
+ rtw_usb_rx_resubmit(rtwusb, rxcb);
+ }
+-
+- return 0;
+ }
+
+ static void rtw_usb_deinit_rx(struct rtw_dev *rtwdev)
+@@ -895,6 +900,8 @@ int rtw_usb_probe(struct usb_interface *
+ goto err_destroy_rxwq;
+ }
+
++ rtw_usb_setup_rx(rtwdev);
++
+ return 0;
+
+ err_destroy_rxwq:
diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile
index d5511f33c1..2fc7977038 100644
--- a/package/network/utils/iptables/Makefile
+++ b/package/network/utils/iptables/Makefile
@@ -355,22 +355,6 @@ iptables extensions for matching cluster.
see `iptables -m cluster --help` for more information.
endef
-define Package/iptables-mod-clusterip
-$(call Package/iptables/Module, +kmod-ipt-clusterip)
- TITLE:=Clusterip extension
-endef
-
-define Package/iptables-mod-clusterip/description
-iptables extensions for CLUSTERIP.
- The CLUSTERIP target allows you to build load-balancing clusters of
- network servers without having a dedicated load-balancing
- router/server/switch.
-
- If you select it, it enables kmod-ipt-clusterip.
-
- see `iptables -j CLUSTERIP --help` for more information.
-endef
-
define Package/iptables-mod-extra
$(call Package/iptables/Module, +kmod-ipt-extra)
TITLE:=Other extra iptables extensions
@@ -762,7 +746,6 @@ $(eval $(call BuildPlugin,iptables-mod-ipsec,$(IPT_IPSEC-m)))
$(eval $(call BuildPlugin,iptables-mod-nat-extra,$(IPT_NAT_EXTRA-m)))
$(eval $(call BuildPlugin,iptables-mod-iprange,$(IPT_IPRANGE-m)))
$(eval $(call BuildPlugin,iptables-mod-cluster,$(IPT_CLUSTER-m)))
-$(eval $(call BuildPlugin,iptables-mod-clusterip,$(IPT_CLUSTERIP-m)))
$(eval $(call BuildPlugin,iptables-mod-hashlimit,$(IPT_HASHLIMIT-m)))
$(eval $(call BuildPlugin,iptables-mod-rpfilter,$(IPT_RPFILTER-m)))
$(eval $(call BuildPlugin,iptables-mod-led,$(IPT_LED-m)))
diff --git a/target/linux/armsr/modules.mk b/target/linux/armsr/modules.mk
index b793f3ff49..15acfd9e48 100644
--- a/target/linux/armsr/modules.mk
+++ b/target/linux/armsr/modules.mk
@@ -92,7 +92,7 @@ define KernelPackage/fsl-enetc-net
CONFIG_FSL_ENETC_QOS=y
FILES:= \
$(LINUX_DIR)/drivers/net/ethernet/freescale/enetc/fsl-enetc.ko \
- $(LINUX_DIR)/drivers/net/ethernet/freescale/enetc/fsl-enetc-core.ko@ge6.3 \
+ $(LINUX_DIR)/drivers/net/ethernet/freescale/enetc/fsl-enetc-core.ko \
$(LINUX_DIR)/drivers/net/ethernet/freescale/enetc/fsl-enetc-vf.ko \
$(LINUX_DIR)/drivers/net/ethernet/freescale/enetc/fsl-enetc-mdio.ko \
$(LINUX_DIR)/drivers/net/ethernet/freescale/enetc/fsl-enetc-ierb.ko
diff --git a/target/linux/ath79/patches-6.6/730-ar8216-make-reg-access-atomic.patch b/target/linux/ath79/patches-6.6/730-ar8216-make-reg-access-atomic.patch
index 02f763534e..16d9005699 100644
--- a/target/linux/ath79/patches-6.6/730-ar8216-make-reg-access-atomic.patch
+++ b/target/linux/ath79/patches-6.6/730-ar8216-make-reg-access-atomic.patch
@@ -14,7 +14,7 @@ with interrupts used.
---
--- a/drivers/net/phy/ar8216.c
+++ b/drivers/net/phy/ar8216.c
-@@ -252,6 +252,7 @@ ar8xxx_mii_write32(struct ar8xxx_priv *p
+@@ -251,6 +251,7 @@ ar8xxx_mii_write32(struct ar8xxx_priv *p
u32
ar8xxx_read(struct ar8xxx_priv *priv, int reg)
{
@@ -22,7 +22,7 @@ with interrupts used.
struct mii_bus *bus = priv->mii_bus;
u16 r1, r2, page;
u32 val;
-@@ -259,11 +260,13 @@ ar8xxx_read(struct ar8xxx_priv *priv, in
+@@ -258,11 +259,13 @@ ar8xxx_read(struct ar8xxx_priv *priv, in
split_addr((u32) reg, &r1, &r2, &page);
mutex_lock(&bus->mdio_lock);
@@ -36,7 +36,7 @@ with interrupts used.
mutex_unlock(&bus->mdio_lock);
return val;
-@@ -272,17 +275,20 @@ ar8xxx_read(struct ar8xxx_priv *priv, in
+@@ -271,17 +274,20 @@ ar8xxx_read(struct ar8xxx_priv *priv, in
void
ar8xxx_write(struct ar8xxx_priv *priv, int reg, u32 val)
{
diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk
index 90db0ca29b..d2f78e47fa 100644
--- a/target/linux/rockchip/image/armv8.mk
+++ b/target/linux/rockchip/image/armv8.mk
@@ -223,8 +223,7 @@ define Device/lyt_t68m
DEVICE_DTS := rockchip/rk3568-lyt-t68m
UBOOT_DEVICE_NAME := lyt-t68m-rk3568
BOOT_FLOW := pine64-img
- DEVICE_PACKAGES := kmod-r8125 kmod-mt7921e kmod-mt7921-firmware \
- kmod-mt7922-firmware wpad-openssl
+ DEVICE_PACKAGES := kmod-r8125 kmod-mt7921e wpad-openssl
endef
TARGET_DEVICES += lyt_t68m