Skip to content

Commit 87273e0

Browse files
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: rtl8821cu: drop broken package kernel: modules: cleanup 5.18 (coolsnowwolf#9946) iproute2: shrink ip-tiny size by disabling features iproute2: update to 5.19.0 iproute2: update to 5.18.0 iproute2: update to 5.17.0 iproute2: update to 5.16.0 iproute2: Remove libxtables from some tc variants
2 parents 23e6923 + 7e274cb commit 87273e0

29 files changed

+125
-355
lines changed

package/kernel/linux/modules/fs.mk

+4-4
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ define KernelPackage/fs-cifs
109109
+kmod-crypto-ccm \
110110
+kmod-crypto-ecb \
111111
+kmod-crypto-des \
112-
+(LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-asn1-decoder \
113-
+(LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-oid-registry \
114-
+(LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-dnsresolver
112+
+(LINUX_5_15||LINUX_5_19):kmod-asn1-decoder \
113+
+(LINUX_5_15||LINUX_5_19):kmod-oid-registry \
114+
+(LINUX_5_15||LINUX_5_19):kmod-dnsresolver
115115
endef
116116

117117
define KernelPackage/fs-cifs/description
@@ -530,7 +530,7 @@ $(eval $(call KernelPackage,fs-ntfs))
530530
define KernelPackage/fs-ntfs3
531531
SUBMENU:=$(FS_MENU)
532532
TITLE:=NTFS3 Read-Write file system support
533-
DEPENDS:=@(LINUX_5_15||LINUX_5_18||LINUX_5_19) +kmod-nls-base
533+
DEPENDS:=@(LINUX_5_15||LINUX_5_19) +kmod-nls-base
534534
KCONFIG:= \
535535
CONFIG_NTFS3_FS \
536536
CONFIG_NTFS3_64BIT_CLUSTER=y \

package/kernel/linux/modules/netdevices.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ $(eval $(call KernelPackage,mii))
142142
define KernelPackage/mdio-devres
143143
SUBMENU:=$(NETWORK_DEVICES_MENU)
144144
TITLE:=Supports MDIO device registration
145-
DEPENDS:=@(LINUX_5_10||LINUX_5_15||LINUX_5_18||LINUX_5_19) +kmod-libphy +(TARGET_armvirt||TARGET_bcm27xx_bcm2708||TARGET_tegra):kmod-of-mdio
145+
DEPENDS:=@(LINUX_5_10||LINUX_5_15||LINUX_5_19) +kmod-libphy +(TARGET_armvirt||TARGET_bcm27xx_bcm2708||TARGET_tegra):kmod-of-mdio
146146
KCONFIG:=CONFIG_MDIO_DEVRES
147147
HIDDEN:=1
148148
FILES:=$(LINUX_DIR)/drivers/net/phy/mdio_devres.ko
@@ -563,7 +563,7 @@ $(eval $(call KernelPackage,8139cp))
563563
define KernelPackage/r8169
564564
SUBMENU:=$(NETWORK_DEVICES_MENU)
565565
TITLE:=RealTek RTL-8169 PCI Gigabit Ethernet Adapter kernel support
566-
DEPENDS:=@PCI_SUPPORT +kmod-mii +r8169-firmware +kmod-phy-realtek +(LINUX_5_10||LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-mdio-devres
566+
DEPENDS:=@PCI_SUPPORT +kmod-mii +r8169-firmware +kmod-phy-realtek +(LINUX_5_10||LINUX_5_15||LINUX_5_19):kmod-mdio-devres
567567
KCONFIG:= \
568568
CONFIG_R8169 \
569569
CONFIG_R8169_NAPI=y \
@@ -689,7 +689,7 @@ $(eval $(call KernelPackage,igbvf))
689689
define KernelPackage/ixgbe
690690
SUBMENU:=$(NETWORK_DEVICES_MENU)
691691
TITLE:=Intel(R) 82598/82599 PCI-Express 10 Gigabit Ethernet support
692-
DEPENDS:=@PCI_SUPPORT +kmod-mdio +kmod-ptp +kmod-hwmon-core +kmod-libphy +(LINUX_5_10||LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-mdio-devres
692+
DEPENDS:=@PCI_SUPPORT +kmod-mdio +kmod-ptp +kmod-hwmon-core +kmod-libphy +(LINUX_5_10||LINUX_5_15||LINUX_5_19):kmod-mdio-devres
693693
KCONFIG:=CONFIG_IXGBE \
694694
CONFIG_IXGBE_VXLAN=n \
695695
CONFIG_IXGBE_HWMON=y \

package/kernel/linux/modules/other.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1151,8 +1151,8 @@ $(eval $(call KernelPackage,keys-trusted))
11511151
define KernelPackage/tpm
11521152
SUBMENU:=$(OTHER_MENU)
11531153
TITLE:=TPM Hardware Support
1154-
DEPENDS:= +kmod-random-core +(LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-asn1-decoder \
1155-
+(LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-asn1-encoder +(LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-oid-registry
1154+
DEPENDS:= +kmod-random-core +(LINUX_5_15||LINUX_5_19):kmod-asn1-decoder \
1155+
+(LINUX_5_15||LINUX_5_19):kmod-asn1-encoder +(LINUX_5_15||LINUX_5_19):kmod-oid-registry
11561156
KCONFIG:= CONFIG_TCG_TPM
11571157
FILES:= $(LINUX_DIR)/drivers/char/tpm/tpm.ko
11581158
AUTOLOAD:=$(call AutoLoad,10,tpm,1)

package/kernel/linux/modules/usb.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,7 @@ $(eval $(call KernelPackage,usb-net-aqc111))
11381138

11391139
define KernelPackage/usb-net-asix
11401140
TITLE:=Kernel module for USB-to-Ethernet Asix convertors
1141-
DEPENDS:=+kmod-libphy +(LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-mdio-devres
1141+
DEPENDS:=+kmod-libphy +(LINUX_5_15||LINUX_5_19):kmod-mdio-devres
11421142
KCONFIG:=CONFIG_USB_NET_AX8817X
11431143
FILES:= \
11441144
$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.ko \

package/kernel/linux/modules/video.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ define KernelPackage/drm
244244
TITLE:=Direct Rendering Manager (DRM) support
245245
HIDDEN:=1
246246
DEPENDS:=+kmod-dma-buf +kmod-i2c-core +kmod-i2c-algo-bit +PACKAGE_kmod-backlight:kmod-backlight \
247-
+(LINUX_5_15||LINUX_5_18||LINUX_5_19):kmod-fb
247+
+(LINUX_5_15||LINUX_5_19):kmod-fb
248248
KCONFIG:= \
249249
CONFIG_DRM \
250250
CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y \

package/kernel/mac80211/ath.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ define KernelPackage/ath11k-ahb
344344
$(call KernelPackage/mac80211/Default)
345345
TITLE:=Qualcomm 802.11ax AHB wireless chipset support
346346
URL:=https://wireless.wiki.kernel.org/en/users/drivers/ath11k
347-
DEPENDS+= @TARGET_ipq807x +kmod-ath11k +(LINUX_5_15||LINUX_5_18):kmod-qrtr-smd
347+
DEPENDS+= @TARGET_ipq807x +kmod-ath11k +(LINUX_5_15||LINUX_5_19):kmod-qrtr-smd
348348
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath11k/ath11k_ahb.ko
349349
AUTOLOAD:=$(call AutoProbe,ath11k_ahb)
350350
endef
@@ -358,7 +358,7 @@ define KernelPackage/ath11k-pci
358358
$(call KernelPackage/mac80211/Default)
359359
TITLE:=Qualcomm 802.11ax PCI wireless chipset support
360360
URL:=https://wireless.wiki.kernel.org/en/users/drivers/ath11k
361-
DEPENDS+= @PCI_SUPPORT +(LINUX_5_15||LINUX_5_18):kmod-qrtr-mhi +kmod-ath11k
361+
DEPENDS+= @PCI_SUPPORT +(LINUX_5_15||LINUX_5_19):kmod-qrtr-mhi +kmod-ath11k
362362
FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath11k/ath11k_pci.ko
363363
AUTOLOAD:=$(call AutoProbe,ath11k_pci)
364364
endef

package/kernel/rtl8821cu/Makefile

-86
This file was deleted.

package/kernel/rtl8821cu/patches/001-use-kernel-byteorder.patch

-15
This file was deleted.

package/kernel/rtl8821cu/patches/020-remove-repeat-flies.patch

-39
This file was deleted.

package/kernel/rtl8821cu/patches/030-change-value-of-vht-enable.patch

-11
This file was deleted.

package/kernel/rtl8821cu/patches/040-wireless-5.8.patch

-58
This file was deleted.

package/kernel/rtl8821cu/patches/050-Buildfix-for-Linux-5.18.patch

-44
This file was deleted.

0 commit comments

Comments
 (0)