Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

x86: add 6.6 as testing kernel #14868

Merged
merged 12 commits into from Apr 4, 2024
Merged
2 changes: 1 addition & 1 deletion package/kernel/linux/modules/netdevices.mk
Expand Up @@ -1742,7 +1742,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
DEPENDS:=@PCI_SUPPORT +kmod-ptp +kmod-mdio-devres +!LINUX_6_1:kmod-fixed-phy
KCONFIG:=CONFIG_LAN743X
FILES:=$(LINUX_DIR)/drivers/net/ethernet/microchip/lan743x.ko
AUTOLOAD:=$(call AutoProbe,lan743x)
Expand Down
5 changes: 3 additions & 2 deletions package/kernel/linux/modules/virt.mk
namiltd marked this conversation as resolved.
Show resolved Hide resolved
Expand Up @@ -22,6 +22,7 @@ define KernelPackage/kvm-x86
KCONFIG:=\
CONFIG_KVM \
CONFIG_KVM_MMU_AUDIT=n \
CONFIG_KVM_SMM=y@ge6.6 \
CONFIG_VIRTUALIZATION=y
FILES:= $(LINUX_DIR)/arch/$(LINUX_KARCH)/kvm/kvm.ko
AUTOLOAD:=$(call AutoProbe,kvm.ko)
Expand Down Expand Up @@ -84,9 +85,9 @@ define KernelPackage/vfio
CONFIG_VFIO_MDEV=n
FILES:= \
$(LINUX_DIR)/drivers/vfio/vfio.ko \
$(LINUX_DIR)/drivers/vfio/vfio_virqfd.ko \
$(LINUX_DIR)/drivers/vfio/vfio_virqfd.ko@lt6.2 \
namiltd marked this conversation as resolved.
Show resolved Hide resolved
$(LINUX_DIR)/drivers/vfio/vfio_iommu_type1.ko
AUTOLOAD:=$(call AutoProbe,vfio vfio_iommu_type1 vfio_virqfd)
AUTOLOAD:=$(call AutoProbe,vfio vfio_iommu_type1 +LINUX_6_1:vfio_virqfd)
endef

define KernelPackage/vfio/description
Expand Down
342 changes: 0 additions & 342 deletions target/linux/generic/hack-6.6/212-tools_portability.patch

This file was deleted.