mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-11 03:25:54 +02:00
Merge branch 'next' into temp-c164-development
This commit is contained in:
Peter Müller
@@ -338,6 +338,7 @@ CONFIG_ARM64_ERRATUM_827319=y
|
||||
CONFIG_ARM64_ERRATUM_824069=y
|
||||
CONFIG_ARM64_ERRATUM_819472=y
|
||||
CONFIG_ARM64_ERRATUM_832075=y
|
||||
CONFIG_ARM64_ERRATUM_834220=y
|
||||
CONFIG_ARM64_ERRATUM_845719=y
|
||||
CONFIG_ARM64_ERRATUM_843419=y
|
||||
CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y
|
||||
@@ -601,8 +602,23 @@ CONFIG_ACPI_IORT=y
|
||||
CONFIG_ACPI_GTDT=y
|
||||
CONFIG_ACPI_PPTT=y
|
||||
# CONFIG_PMIC_OPREGION is not set
|
||||
CONFIG_IRQ_BYPASS_MANAGER=y
|
||||
CONFIG_VIRTUALIZATION=y
|
||||
# CONFIG_KVM is not set
|
||||
CONFIG_KVM=y
|
||||
CONFIG_HAVE_KVM_IRQCHIP=y
|
||||
CONFIG_HAVE_KVM_IRQFD=y
|
||||
CONFIG_HAVE_KVM_IRQ_ROUTING=y
|
||||
CONFIG_HAVE_KVM_EVENTFD=y
|
||||
CONFIG_KVM_MMIO=y
|
||||
CONFIG_HAVE_KVM_MSI=y
|
||||
CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
|
||||
CONFIG_KVM_VFIO=y
|
||||
CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
|
||||
CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
|
||||
CONFIG_HAVE_KVM_IRQ_BYPASS=y
|
||||
CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
|
||||
CONFIG_KVM_XFER_TO_GUEST_WORK=y
|
||||
# CONFIG_NVHE_EL2_DEBUG is not set
|
||||
CONFIG_ARM64_CRYPTO=y
|
||||
# CONFIG_CRYPTO_SHA256_ARM64 is not set
|
||||
# CONFIG_CRYPTO_SHA512_ARM64 is not set
|
||||
@@ -813,6 +829,7 @@ CONFIG_BFQ_GROUP_IOSCHED=y
|
||||
# CONFIG_BFQ_CGROUP_DEBUG is not set
|
||||
# end of IO Schedulers
|
||||
|
||||
CONFIG_PREEMPT_NOTIFIERS=y
|
||||
CONFIG_PADATA=y
|
||||
CONFIG_ASN1=y
|
||||
CONFIG_ARCH_INLINE_SPIN_TRYLOCK=y
|
||||
@@ -915,6 +932,7 @@ CONFIG_PAGE_REPORTING=y
|
||||
CONFIG_MIGRATION=y
|
||||
CONFIG_CONTIG_ALLOC=y
|
||||
CONFIG_PHYS_ADDR_T_64BIT=y
|
||||
CONFIG_MMU_NOTIFIER=y
|
||||
CONFIG_KSM=y
|
||||
CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
|
||||
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
|
||||
@@ -1803,7 +1821,7 @@ CONFIG_FW_LOADER_PAGED_BUF=y
|
||||
CONFIG_EXTRA_FIRMWARE=""
|
||||
CONFIG_FW_LOADER_USER_HELPER=y
|
||||
# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
|
||||
# CONFIG_FW_LOADER_COMPRESS is not set
|
||||
CONFIG_FW_LOADER_COMPRESS=y
|
||||
# end of Firmware loader
|
||||
|
||||
CONFIG_WANT_DEV_COREDUMP=y
|
||||
@@ -7872,6 +7890,7 @@ CONFIG_TEXTSEARCH=y
|
||||
CONFIG_TEXTSEARCH_KMP=m
|
||||
CONFIG_TEXTSEARCH_BM=m
|
||||
CONFIG_TEXTSEARCH_FSM=m
|
||||
CONFIG_INTERVAL_TREE=y
|
||||
CONFIG_ASSOCIATIVE_ARRAY=y
|
||||
CONFIG_HAS_IOMEM=y
|
||||
CONFIG_HAS_IOPORT_MAP=y
|
||||
|
||||
@@ -1826,7 +1826,7 @@ CONFIG_FW_LOADER_PAGED_BUF=y
|
||||
CONFIG_EXTRA_FIRMWARE=""
|
||||
CONFIG_FW_LOADER_USER_HELPER=y
|
||||
# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
|
||||
# CONFIG_FW_LOADER_COMPRESS is not set
|
||||
CONFIG_FW_LOADER_COMPRESS=y
|
||||
# end of Firmware loader
|
||||
|
||||
CONFIG_WANT_DEV_COREDUMP=y
|
||||
|
||||
@@ -1830,7 +1830,7 @@ CONFIG_FW_LOADER_PAGED_BUF=y
|
||||
CONFIG_EXTRA_FIRMWARE=""
|
||||
CONFIG_FW_LOADER_USER_HELPER=y
|
||||
# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
|
||||
# CONFIG_FW_LOADER_COMPRESS is not set
|
||||
CONFIG_FW_LOADER_COMPRESS=y
|
||||
CONFIG_FW_CACHE=y
|
||||
# end of Firmware loader
|
||||
|
||||
|
||||
@@ -6550,6 +6550,7 @@ etc/modprobe.d/ipv6.conf
|
||||
#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_826319
|
||||
#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_827319
|
||||
#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_832075
|
||||
#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_834220
|
||||
#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_843419
|
||||
#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_845719
|
||||
#lib/modules/KVER-ipfire/build/include/config/ARM64_ERRATUM_858921
|
||||
@@ -7613,6 +7614,7 @@ etc/modprobe.d/ipv6.conf
|
||||
#lib/modules/KVER-ipfire/build/include/config/FUTEX_PI
|
||||
#lib/modules/KVER-ipfire/build/include/config/FWNODE_MDIO
|
||||
#lib/modules/KVER-ipfire/build/include/config/FW_LOADER
|
||||
#lib/modules/KVER-ipfire/build/include/config/FW_LOADER_COMPRESS
|
||||
#lib/modules/KVER-ipfire/build/include/config/FW_LOADER_PAGED_BUF
|
||||
#lib/modules/KVER-ipfire/build/include/config/FW_LOADER_USER_HELPER
|
||||
#lib/modules/KVER-ipfire/build/include/config/GACT_PROB
|
||||
@@ -7755,6 +7757,15 @@ etc/modprobe.d/ipv6.conf
|
||||
#lib/modules/KVER-ipfire/build/include/config/HAVE_KCSAN_COMPILER
|
||||
#lib/modules/KVER-ipfire/build/include/config/HAVE_KPROBES
|
||||
#lib/modules/KVER-ipfire/build/include/config/HAVE_KRETPROBES
|
||||
#lib/modules/KVER-ipfire/build/include/config/HAVE_KVM_ARCH_TLB_FLUSH_ALL
|
||||
#lib/modules/KVER-ipfire/build/include/config/HAVE_KVM_CPU_RELAX_INTERCEPT
|
||||
#lib/modules/KVER-ipfire/build/include/config/HAVE_KVM_EVENTFD
|
||||
#lib/modules/KVER-ipfire/build/include/config/HAVE_KVM_IRQCHIP
|
||||
#lib/modules/KVER-ipfire/build/include/config/HAVE_KVM_IRQFD
|
||||
#lib/modules/KVER-ipfire/build/include/config/HAVE_KVM_IRQ_BYPASS
|
||||
#lib/modules/KVER-ipfire/build/include/config/HAVE_KVM_IRQ_ROUTING
|
||||
#lib/modules/KVER-ipfire/build/include/config/HAVE_KVM_MSI
|
||||
#lib/modules/KVER-ipfire/build/include/config/HAVE_KVM_VCPU_RUN_PID_CHANGE
|
||||
#lib/modules/KVER-ipfire/build/include/config/HAVE_MOD_ARCH_SPECIFIC
|
||||
#lib/modules/KVER-ipfire/build/include/config/HAVE_MOVE_PMD
|
||||
#lib/modules/KVER-ipfire/build/include/config/HAVE_MOVE_PUD
|
||||
@@ -7998,6 +8009,7 @@ etc/modprobe.d/ipv6.conf
|
||||
#lib/modules/KVER-ipfire/build/include/config/INPUT_YEALINK
|
||||
#lib/modules/KVER-ipfire/build/include/config/INTEGRITY
|
||||
#lib/modules/KVER-ipfire/build/include/config/INTEL_XWAY_PHY
|
||||
#lib/modules/KVER-ipfire/build/include/config/INTERVAL_TREE
|
||||
#lib/modules/KVER-ipfire/build/include/config/IOMMU_API
|
||||
#lib/modules/KVER-ipfire/build/include/config/IOMMU_DEFAULT_DMA_STRICT
|
||||
#lib/modules/KVER-ipfire/build/include/config/IOMMU_DMA
|
||||
@@ -8145,6 +8157,7 @@ etc/modprobe.d/ipv6.conf
|
||||
#lib/modules/KVER-ipfire/build/include/config/IP_VS_WLC
|
||||
#lib/modules/KVER-ipfire/build/include/config/IP_VS_WRR
|
||||
#lib/modules/KVER-ipfire/build/include/config/IRQCHIP
|
||||
#lib/modules/KVER-ipfire/build/include/config/IRQ_BYPASS_MANAGER
|
||||
#lib/modules/KVER-ipfire/build/include/config/IRQ_DOMAIN
|
||||
#lib/modules/KVER-ipfire/build/include/config/IRQ_DOMAIN_HIERARCHY
|
||||
#lib/modules/KVER-ipfire/build/include/config/IRQ_FASTEOI_HIERARCHY_HANDLERS
|
||||
@@ -8215,6 +8228,11 @@ etc/modprobe.d/ipv6.conf
|
||||
#lib/modules/KVER-ipfire/build/include/config/KSM
|
||||
#lib/modules/KVER-ipfire/build/include/config/KSZ884X_PCI
|
||||
#lib/modules/KVER-ipfire/build/include/config/KUSER_HELPERS
|
||||
#lib/modules/KVER-ipfire/build/include/config/KVM
|
||||
#lib/modules/KVER-ipfire/build/include/config/KVM_GENERIC_DIRTYLOG_READ_PROTECT
|
||||
#lib/modules/KVER-ipfire/build/include/config/KVM_MMIO
|
||||
#lib/modules/KVER-ipfire/build/include/config/KVM_VFIO
|
||||
#lib/modules/KVER-ipfire/build/include/config/KVM_XFER_TO_GUEST_WORK
|
||||
#lib/modules/KVER-ipfire/build/include/config/L2TP
|
||||
#lib/modules/KVER-ipfire/build/include/config/L2TP_ETH
|
||||
#lib/modules/KVER-ipfire/build/include/config/L2TP_IP
|
||||
@@ -8503,6 +8521,7 @@ etc/modprobe.d/ipv6.conf
|
||||
#lib/modules/KVER-ipfire/build/include/config/MMU
|
||||
#lib/modules/KVER-ipfire/build/include/config/MMU_GATHER_RCU_TABLE_FREE
|
||||
#lib/modules/KVER-ipfire/build/include/config/MMU_GATHER_TABLE_FREE
|
||||
#lib/modules/KVER-ipfire/build/include/config/MMU_NOTIFIER
|
||||
#lib/modules/KVER-ipfire/build/include/config/MODPROBE_PATH
|
||||
#lib/modules/KVER-ipfire/build/include/config/MODULES
|
||||
#lib/modules/KVER-ipfire/build/include/config/MODULES_TREE_LOOKUP
|
||||
@@ -9312,6 +9331,7 @@ etc/modprobe.d/ipv6.conf
|
||||
#lib/modules/KVER-ipfire/build/include/config/PPP_SYNC_TTY
|
||||
#lib/modules/KVER-ipfire/build/include/config/PPS
|
||||
#lib/modules/KVER-ipfire/build/include/config/PPTP
|
||||
#lib/modules/KVER-ipfire/build/include/config/PREEMPT_NOTIFIERS
|
||||
#lib/modules/KVER-ipfire/build/include/config/PREEMPT_VOLUNTARY
|
||||
#lib/modules/KVER-ipfire/build/include/config/PRESTERA
|
||||
#lib/modules/KVER-ipfire/build/include/config/PRESTERA_PCI
|
||||
|
||||
@@ -8061,6 +8061,7 @@ etc/modprobe.d/ipv6.conf
|
||||
#lib/modules/KVER-ipfire/build/include/config/FUTEX_PI
|
||||
#lib/modules/KVER-ipfire/build/include/config/FWNODE_MDIO
|
||||
#lib/modules/KVER-ipfire/build/include/config/FW_LOADER
|
||||
#lib/modules/KVER-ipfire/build/include/config/FW_LOADER_COMPRESS
|
||||
#lib/modules/KVER-ipfire/build/include/config/FW_LOADER_PAGED_BUF
|
||||
#lib/modules/KVER-ipfire/build/include/config/FW_LOADER_USER_HELPER
|
||||
#lib/modules/KVER-ipfire/build/include/config/GACT_PROB
|
||||
|
||||
@@ -7611,6 +7611,7 @@ etc/modprobe.d/ipv6.conf
|
||||
#lib/modules/KVER-ipfire/build/include/config/FW_ATTR_CLASS
|
||||
#lib/modules/KVER-ipfire/build/include/config/FW_CACHE
|
||||
#lib/modules/KVER-ipfire/build/include/config/FW_LOADER
|
||||
#lib/modules/KVER-ipfire/build/include/config/FW_LOADER_COMPRESS
|
||||
#lib/modules/KVER-ipfire/build/include/config/FW_LOADER_PAGED_BUF
|
||||
#lib/modules/KVER-ipfire/build/include/config/FW_LOADER_USER_HELPER
|
||||
#lib/modules/KVER-ipfire/build/include/config/GACT_PROB
|
||||
|
||||
Reference in New Issue
Block a user