diff options
11 files changed, 292 insertions, 248 deletions
| diff --git a/data/defaults.toml b/data/defaults.toml index 42663d7e..0797a6f3 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -14,7 +14,7 @@ vyos_mirror = "https://rolling-packages.vyos.net/current"  vyos_branch = "current"  release_train = "current" -kernel_version = "6.1.70" +kernel_version = "6.6.9"  bootloaders = "syslinux,grub-efi"  squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery" diff --git a/data/live-build-config/archives/bookworm-backports.pref.chroot b/data/live-build-config/archives/bookworm-backports.pref.chroot new file mode 100644 index 00000000..b9eabc58 --- /dev/null +++ b/data/live-build-config/archives/bookworm-backports.pref.chroot @@ -0,0 +1,7 @@ +Package: iproute2 +Pin: release n=bookworm-backports +Pin-Priority: 600 + +Package: * +Pin: release n=bookworm-backports +Pin-Priority: -100 diff --git a/data/live-build-config/archives/trixie.pref.chroot b/data/live-build-config/archives/trixie.pref.chroot index 4e685cd4..a7d8b0ea 100644 --- a/data/live-build-config/archives/trixie.pref.chroot +++ b/data/live-build-config/archives/trixie.pref.chroot @@ -1,10 +1,10 @@  Package: podman  Pin: release n=trixie -Pin-Priority: 600 +Pin-Priority: 900  Package: netavark  Pin: release n=trixie -Pin-Priority: 600 +Pin-Priority: 900  Package: *  Pin: release n=trixie diff --git a/docker/Dockerfile b/docker/Dockerfile index 953ea4c6..219a8065 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (C) 2018-2022 VyOS maintainers and contributors +# Copyright (C) 2018-2024 VyOS maintainers and contributors  #  # This program is free software; you can redistribute it and/or modify  # in order to easy exprort images built to "external" world @@ -191,7 +191,9 @@ RUN apt-get update && apt-get install -y \        kmod \        cpio \        python-is-python3 \ -      dwarves +      dwarves \ +      nasm \ +      rdfind  # Packages needed for Intel QAT out-of-tree drivers  # FPM is used when generation Debian pckages for e.g. Intel QAT drivers diff --git a/packages/linux-kernel/Jenkinsfile b/packages/linux-kernel/Jenkinsfile index 48f24577..a27ddf80 100644 --- a/packages/linux-kernel/Jenkinsfile +++ b/packages/linux-kernel/Jenkinsfile @@ -44,12 +44,12 @@ def pkgList = [       '''],      // Firmware -    ['name': 'linux-firmware', 'scmCommit': '20230625', +    ['name': 'linux-firmware', 'scmCommit': '20231211',       'scmUrl': 'https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git',       'buildCmd': 'cd ..; ./build-linux-firmware.sh'],      // Accel-PPP -    ['name': 'accel-ppp', 'scmCommit': '9669bcb99adc', +    ['name': 'accel-ppp', 'scmCommit': '19c36e593d9b',       'scmUrl': 'https://github.com/accel-ppp/accel-ppp.git',       'buildCmd': 'cd ..; pwd; ls -al; ./build-accel-ppp.sh'], @@ -60,7 +60,7 @@ def pkgList = [      ['name': 'jool', 'buildCmd': 'cd ..; ./build-jool.py'],      // OpenVPN DCO -    ['name': 'ovpn-dco','scmCommit': 'v0.2.20230426', +    ['name': 'ovpn-dco','scmCommit': 'v0.2.20231117',       'scmUrl': 'https://github.com/OpenVPN/ovpn-dco',       'buildCmd': 'cd ..; ./build-openvpn-dco.sh'],  ] diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig index 3d214bc8..6aab16d8 100644 --- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig +++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig @@ -1,6 +1,6 @@  #  # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.55 Kernel Configuration +# Linux/x86 6.6.9 Kernel Configuration  #  CONFIG_CC_VERSION_TEXT="gcc (Debian 12.2.0-14) 12.2.0"  CONFIG_CC_IS_GCC=y @@ -15,6 +15,7 @@ CONFIG_CC_CAN_LINK=y  CONFIG_CC_CAN_LINK_STATIC=y  CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y  CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_TOOLS_SUPPORT_RELR=y  CONFIG_CC_HAS_ASM_INLINE=y  CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y  CONFIG_PAHOLE_VERSION=124 @@ -73,7 +74,6 @@ CONFIG_GENERIC_IRQ_CHIP=y  CONFIG_IRQ_DOMAIN=y  CONFIG_IRQ_DOMAIN_HIERARCHY=y  CONFIG_GENERIC_MSI_IRQ=y -CONFIG_GENERIC_MSI_IRQ_DOMAIN=y  CONFIG_IRQ_MSI_IOMMU=y  CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y  CONFIG_GENERIC_IRQ_RESERVATION_MODE=y @@ -155,7 +155,6 @@ CONFIG_CPU_ISOLATION=y  CONFIG_TREE_RCU=y  CONFIG_PREEMPT_RCU=y  # CONFIG_RCU_EXPERT is not set -CONFIG_SRCU=y  CONFIG_TREE_SRCU=y  CONFIG_TASKS_RCU_GENERIC=y  CONFIG_TASKS_RCU=y @@ -169,7 +168,6 @@ CONFIG_IKCONFIG_PROC=y  # CONFIG_IKHEADERS is not set  CONFIG_LOG_BUF_SHIFT=17  CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 -CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13  # CONFIG_PRINTK_INDEX is not set  CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y @@ -184,7 +182,6 @@ CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y  CONFIG_CC_HAS_INT128=y  CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"  CONFIG_GCC11_NO_ARRAY_BOUNDS=y -CONFIG_GCC12_NO_ARRAY_BOUNDS=y  CONFIG_CC_NO_ARRAY_BOUNDS=y  CONFIG_ARCH_SUPPORTS_INT128=y  CONFIG_NUMA_BALANCING=y @@ -196,6 +193,7 @@ CONFIG_MEMCG=y  CONFIG_MEMCG_KMEM=y  # CONFIG_BLK_CGROUP is not set  # CONFIG_CGROUP_SCHED is not set +CONFIG_SCHED_MM_CID=y  CONFIG_CGROUP_PIDS=y  # CONFIG_CGROUP_RDMA is not set  # CONFIG_CGROUP_FREEZER is not set @@ -217,7 +215,6 @@ CONFIG_PID_NS=y  CONFIG_NET_NS=y  # CONFIG_CHECKPOINT_RESTORE is not set  # CONFIG_SCHED_AUTOGROUP is not set -# CONFIG_SYSFS_DEPRECATED is not set  CONFIG_RELAY=y  CONFIG_BLK_DEV_INITRD=y  CONFIG_INITRAMFS_SOURCE="" @@ -233,6 +230,7 @@ CONFIG_INITRAMFS_PRESERVE_MTIME=y  CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y  # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set  CONFIG_LD_ORPHAN_WARN=y +CONFIG_LD_ORPHAN_WARN_LEVEL="warn"  CONFIG_SYSCTL=y  CONFIG_HAVE_UID16=y  CONFIG_SYSCTL_EXCEPTION_TRACE=y @@ -261,14 +259,15 @@ CONFIG_IO_URING=y  CONFIG_ADVISE_SYSCALLS=y  CONFIG_MEMBARRIER=y  CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_SELFTEST is not set  CONFIG_KALLSYMS_ALL=y  CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y  CONFIG_KALLSYMS_BASE_RELATIVE=y  CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y  # CONFIG_KCMP is not set  CONFIG_RSEQ=y +CONFIG_CACHESTAT_SYSCALL=y  # CONFIG_DEBUG_RSEQ is not set -# CONFIG_EMBEDDED is not set  CONFIG_HAVE_PERF_EVENTS=y  CONFIG_GUEST_PERF_EVENTS=y  # CONFIG_PC104 is not set @@ -283,6 +282,16 @@ CONFIG_PERF_EVENTS=y  CONFIG_SYSTEM_DATA_VERIFICATION=y  # CONFIG_PROFILING is not set  CONFIG_TRACEPOINTS=y + +# +# Kexec and crash features +# +CONFIG_CRASH_CORE=y +CONFIG_KEXEC_CORE=y +CONFIG_KEXEC=y +# CONFIG_KEXEC_FILE is not set +# CONFIG_CRASH_DUMP is not set +# end of Kexec and crash features  # end of General setup  CONFIG_64BIT=y @@ -304,7 +313,6 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y  CONFIG_GENERIC_CALIBRATE_DELAY=y  CONFIG_ARCH_HAS_CPU_RELAX=y  CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_NR_GPIO=1024  CONFIG_ARCH_SUSPEND_POSSIBLE=y  CONFIG_AUDIT_ARCH=y  CONFIG_HAVE_INTEL_TXT=y @@ -318,7 +326,6 @@ CONFIG_CC_HAS_SANE_STACKPROTECTOR=y  # Processor type and features  #  CONFIG_SMP=y -CONFIG_X86_FEATURE_NAMES=y  CONFIG_X86_X2APIC=y  CONFIG_X86_MPPARSE=y  # CONFIG_GOLDFISH is not set @@ -417,8 +424,6 @@ CONFIG_X86_ESPFIX64=y  CONFIG_X86_VSYSCALL_EMULATION=y  CONFIG_X86_IOPL_IOPERM=y  CONFIG_MICROCODE=y -CONFIG_MICROCODE_INTEL=y -CONFIG_MICROCODE_AMD=y  # CONFIG_MICROCODE_LATE_LOADING is not set  CONFIG_X86_MSR=m  CONFIG_X86_CPUID=m @@ -453,18 +458,27 @@ CONFIG_X86_INTEL_TSX_MODE_OFF=y  # CONFIG_X86_INTEL_TSX_MODE_ON is not set  # CONFIG_X86_INTEL_TSX_MODE_AUTO is not set  # CONFIG_X86_SGX is not set +# CONFIG_X86_USER_SHADOW_STACK is not set  CONFIG_EFI=y  CONFIG_EFI_STUB=y +CONFIG_EFI_HANDOVER_PROTOCOL=y  CONFIG_EFI_MIXED=y +# CONFIG_EFI_FAKE_MEMMAP is not set +CONFIG_EFI_RUNTIME_MAP=y  # CONFIG_HZ_100 is not set  # CONFIG_HZ_250 is not set  # CONFIG_HZ_300 is not set  CONFIG_HZ_1000=y  CONFIG_HZ=1000  CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y -# CONFIG_KEXEC_FILE is not set -# CONFIG_CRASH_DUMP is not set +CONFIG_ARCH_SUPPORTS_KEXEC=y +CONFIG_ARCH_SUPPORTS_KEXEC_FILE=y +CONFIG_ARCH_SUPPORTS_KEXEC_SIG=y +CONFIG_ARCH_SUPPORTS_KEXEC_SIG_FORCE=y +CONFIG_ARCH_SUPPORTS_KEXEC_BZIMAGE_VERIFY_SIG=y +CONFIG_ARCH_SUPPORTS_KEXEC_JUMP=y +CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y +CONFIG_ARCH_SUPPORTS_CRASH_HOTPLUG=y  CONFIG_PHYSICAL_START=0x1000000  CONFIG_RELOCATABLE=y  CONFIG_RANDOMIZE_BASE=y @@ -473,9 +487,8 @@ CONFIG_PHYSICAL_ALIGN=0x200000  CONFIG_DYNAMIC_MEMORY_LAYOUT=y  CONFIG_RANDOMIZE_MEMORY=y  CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa +# CONFIG_ADDRESS_MASKING is not set  CONFIG_HOTPLUG_CPU=y -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set  # CONFIG_COMPAT_VDSO is not set  # CONFIG_LEGACY_VSYSCALL_XONLY is not set  CONFIG_LEGACY_VSYSCALL_NONE=y @@ -487,18 +500,26 @@ CONFIG_HAVE_LIVEPATCH=y  CONFIG_CC_HAS_SLS=y  CONFIG_CC_HAS_RETURN_THUNK=y +CONFIG_CC_HAS_ENTRY_PADDING=y +CONFIG_FUNCTION_PADDING_CFI=11 +CONFIG_FUNCTION_PADDING_BYTES=16 +CONFIG_CALL_PADDING=y +CONFIG_HAVE_CALL_THUNKS=y +CONFIG_CALL_THUNKS=y +CONFIG_PREFIX_SYMBOLS=y  CONFIG_SPECULATION_MITIGATIONS=y  CONFIG_PAGE_TABLE_ISOLATION=y  CONFIG_RETPOLINE=y  CONFIG_RETHUNK=y  CONFIG_CPU_UNRET_ENTRY=y +CONFIG_CALL_DEPTH_TRACKING=y +# CONFIG_CALL_THUNKS_DEBUG is not set  CONFIG_CPU_IBPB_ENTRY=y  CONFIG_CPU_IBRS_ENTRY=y  CONFIG_CPU_SRSO=y  # CONFIG_SLS is not set  # CONFIG_GDS_FORCE_MITIGATION is not set  CONFIG_ARCH_HAS_ADD_PAGES=y -CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y  #  # Power management and ACPI options @@ -575,6 +596,7 @@ CONFIG_ACPI_ADXL=y  # CONFIG_ACPI_CONFIGFS is not set  # CONFIG_ACPI_PFRUT is not set  CONFIG_ACPI_PCC=y +# CONFIG_ACPI_FFH is not set  # CONFIG_PMIC_OPREGION is not set  CONFIG_ACPI_PRMT=y  CONFIG_X86_PM_TIMER=y @@ -624,7 +646,7 @@ CONFIG_CPU_IDLE=y  CONFIG_CPU_IDLE_GOV_LADDER=y  CONFIG_CPU_IDLE_GOV_MENU=y  # CONFIG_CPU_IDLE_GOV_TEO is not set -# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set +CONFIG_CPU_IDLE_GOV_HALTPOLL=y  CONFIG_HALTPOLL_CPUIDLE=y  # end of CPU Idle @@ -660,13 +682,18 @@ CONFIG_AS_AVX512=y  CONFIG_AS_SHA1_NI=y  CONFIG_AS_SHA256_NI=y  CONFIG_AS_TPAUSE=y +CONFIG_AS_GFNI=y +CONFIG_AS_WRUSS=y  #  # General architecture-dependent options  # -CONFIG_CRASH_CORE=y -CONFIG_KEXEC_CORE=y  CONFIG_HOTPLUG_SMT=y +CONFIG_HOTPLUG_CORE_SYNC=y +CONFIG_HOTPLUG_CORE_SYNC_DEAD=y +CONFIG_HOTPLUG_CORE_SYNC_FULL=y +CONFIG_HOTPLUG_SPLIT_STARTUP=y +CONFIG_HOTPLUG_PARALLEL=y  CONFIG_GENERIC_ENTRY=y  # CONFIG_KPROBES is not set  CONFIG_JUMP_LABEL=y @@ -712,7 +739,9 @@ CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y  CONFIG_MMU_GATHER_TABLE_FREE=y  CONFIG_MMU_GATHER_RCU_TABLE_FREE=y  CONFIG_MMU_GATHER_MERGE_VMAS=y +CONFIG_MMU_LAZY_TLB_REFCOUNT=y  CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_ARCH_HAS_NMI_SAFE_THIS_CPU_OPS=y  CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y  CONFIG_HAVE_CMPXCHG_LOCAL=y  CONFIG_HAVE_CMPXCHG_DOUBLE=y @@ -743,6 +772,7 @@ CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y  CONFIG_HAVE_ARCH_HUGE_VMAP=y  CONFIG_HAVE_ARCH_HUGE_VMALLOC=y  CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y +CONFIG_ARCH_WANT_PMD_MKWRITE=y  CONFIG_HAVE_ARCH_SOFT_DIRTY=y  CONFIG_HAVE_MOD_ARCH_SPECIFIC=y  CONFIG_MODULES_USE_ELF_RELA=y @@ -801,11 +831,15 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y  # end of GCOV-based kernel profiling  CONFIG_HAVE_GCC_PLUGINS=y +CONFIG_FUNCTION_ALIGNMENT_4B=y +CONFIG_FUNCTION_ALIGNMENT_16B=y +CONFIG_FUNCTION_ALIGNMENT=16  # end of General architecture-dependent options  CONFIG_RT_MUTEXES=y  CONFIG_BASE_SMALL=0  CONFIG_MODULES=y +# CONFIG_MODULE_DEBUG is not set  CONFIG_MODULE_FORCE_LOAD=y  CONFIG_MODULE_UNLOAD=y  CONFIG_MODULE_FORCE_UNLOAD=y @@ -861,7 +895,6 @@ CONFIG_EFI_PARTITION=y  # CONFIG_CMDLINE_PARTITION is not set  # end of Partition Types -CONFIG_BLOCK_COMPAT=y  CONFIG_BLK_MQ_PCI=y  CONFIG_BLK_MQ_VIRTIO=y  CONFIG_BLK_PM=y @@ -912,14 +945,15 @@ CONFIG_COREDUMP=y  #  # SLAB allocator options  # -# CONFIG_SLAB is not set +# CONFIG_SLAB_DEPRECATED is not set  CONFIG_SLUB=y -# CONFIG_SLOB is not set +# CONFIG_SLUB_TINY is not set  CONFIG_SLAB_MERGE_DEFAULT=y  CONFIG_SLAB_FREELIST_RANDOM=y  CONFIG_SLAB_FREELIST_HARDENED=y  # CONFIG_SLUB_STATS is not set  CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_RANDOM_KMALLOC_CACHES is not set  # end of SLAB allocator options  # CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set @@ -928,6 +962,8 @@ CONFIG_SPARSEMEM=y  CONFIG_SPARSEMEM_EXTREME=y  CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y  CONFIG_SPARSEMEM_VMEMMAP=y +CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP=y +CONFIG_ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP=y  CONFIG_HAVE_FAST_GUP=y  CONFIG_NUMA_KEEP_MEMINFO=y  CONFIG_MEMORY_ISOLATION=y @@ -939,6 +975,7 @@ CONFIG_MEMORY_HOTPLUG=y  # CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set  CONFIG_MEMORY_HOTREMOVE=y  CONFIG_MHP_MEMMAP_ON_MEMORY=y +CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y  CONFIG_SPLIT_PTLOCK_CPUS=4  CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y  CONFIG_MEMORY_BALLOON=y @@ -982,21 +1019,23 @@ CONFIG_ARCH_HAS_ZONE_DMA_SET=y  CONFIG_ZONE_DMA=y  CONFIG_ZONE_DMA32=y  # CONFIG_ZONE_DEVICE is not set -CONFIG_VMAP_PFN=y  CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y  CONFIG_ARCH_HAS_PKEYS=y  CONFIG_VM_EVENT_COUNTERS=y  # CONFIG_PERCPU_STATS is not set  # CONFIG_GUP_TEST is not set +# CONFIG_DMAPOOL_TEST is not set  CONFIG_ARCH_HAS_PTE_SPECIAL=y +CONFIG_MEMFD_CREATE=y  CONFIG_SECRETMEM=y  # CONFIG_ANON_VMA_NAME is not set  CONFIG_USERFAULTFD=y  CONFIG_HAVE_ARCH_USERFAULTFD_WP=y  CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y -CONFIG_PTE_MARKER=y  CONFIG_PTE_MARKER_UFFD_WP=y  # CONFIG_LRU_GEN is not set +CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y +CONFIG_PER_VMA_LOCK=y  CONFIG_LOCK_MM_AND_FIND_VMA=y  # @@ -1010,6 +1049,7 @@ CONFIG_NET=y  CONFIG_COMPAT_NETLINK_MESSAGES=y  CONFIG_NET_INGRESS=y  CONFIG_NET_EGRESS=y +CONFIG_NET_XGRESS=y  CONFIG_NET_REDIRECT=y  CONFIG_SKB_EXTENSIONS=y @@ -1150,6 +1190,7 @@ CONFIG_NETFILTER_SKIP_EGRESS=y  CONFIG_NETFILTER_NETLINK=m  CONFIG_NETFILTER_FAMILY_BRIDGE=y  CONFIG_NETFILTER_FAMILY_ARP=y +CONFIG_NETFILTER_BPF_LINK=y  # CONFIG_NETFILTER_NETLINK_HOOK is not set  CONFIG_NETFILTER_NETLINK_ACCT=m  CONFIG_NETFILTER_NETLINK_QUEUE=m @@ -1207,7 +1248,6 @@ CONFIG_NFT_MASQ=m  CONFIG_NFT_REDIR=m  CONFIG_NFT_NAT=m  CONFIG_NFT_TUNNEL=m -CONFIG_NFT_OBJREF=m  CONFIG_NFT_QUEUE=m  CONFIG_NFT_QUOTA=m  CONFIG_NFT_REJECT=m @@ -1420,7 +1460,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m  CONFIG_IP_NF_TARGET_NETMAP=m  CONFIG_IP_NF_TARGET_REDIRECT=m  CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m  CONFIG_IP_NF_TARGET_ECN=m  CONFIG_IP_NF_TARGET_TTL=m  CONFIG_IP_NF_RAW=m @@ -1549,7 +1588,6 @@ CONFIG_NET_SCHED=y  #  # Queueing/Scheduling  # -CONFIG_NET_SCH_CBQ=m  CONFIG_NET_SCH_HTB=m  CONFIG_NET_SCH_HFSC=m  CONFIG_NET_SCH_PRIO=m @@ -1561,9 +1599,9 @@ CONFIG_NET_SCH_TEQL=m  CONFIG_NET_SCH_TBF=m  CONFIG_NET_SCH_CBS=m  CONFIG_NET_SCH_ETF=m +CONFIG_NET_SCH_MQPRIO_LIB=m  # CONFIG_NET_SCH_TAPRIO is not set  CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m  CONFIG_NET_SCH_NETEM=m  CONFIG_NET_SCH_DRR=m  CONFIG_NET_SCH_MQPRIO=m @@ -1653,6 +1691,7 @@ CONFIG_NET_L3_MASTER_DEV=y  # CONFIG_QRTR is not set  # CONFIG_NET_NCSI is not set  CONFIG_PCPU_DEV_REFCNT=y +CONFIG_MAX_SKB_FRAGS=17  CONFIG_RPS=y  CONFIG_RFS_ACCEL=y  CONFIG_SOCK_RX_QUEUE_MAPPING=y @@ -1762,7 +1801,6 @@ CONFIG_PCIE_DPC=y  CONFIG_PCIE_PTM=y  # CONFIG_PCIE_EDR is not set  CONFIG_PCI_MSI=y -CONFIG_PCI_MSI_IRQ_DOMAIN=y  CONFIG_PCI_QUIRKS=y  # CONFIG_PCI_DEBUG is not set  CONFIG_PCI_REALLOC_ENABLE_AUTO=y @@ -1797,21 +1835,21 @@ CONFIG_VMD=m  CONFIG_PCI_HYPERV_INTERFACE=m  # -# DesignWare PCI Core Support +# Cadence-based PCIe controllers  # -# CONFIG_PCIE_DW_PLAT_HOST is not set -# CONFIG_PCI_MESON is not set -# end of DesignWare PCI Core Support +# end of Cadence-based PCIe controllers  # -# Mobiveil PCIe Core Support +# DesignWare-based PCIe controllers  # -# end of Mobiveil PCIe Core Support +# CONFIG_PCI_MESON is not set +# CONFIG_PCIE_DW_PLAT_HOST is not set +# end of DesignWare-based PCIe controllers  # -# Cadence PCIe controllers support +# Mobiveil-based PCIe controllers  # -# end of Cadence PCIe controllers support +# end of Mobiveil-based PCIe controllers  # end of PCI controller drivers  # @@ -1845,6 +1883,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y  # Firmware loader  #  CONFIG_FW_LOADER=y +CONFIG_FW_LOADER_DEBUG=y  CONFIG_FW_LOADER_PAGED_BUF=y  CONFIG_FW_LOADER_SYSFS=y  CONFIG_EXTRA_FIRMWARE="" @@ -1871,6 +1910,7 @@ CONFIG_REGMAP_MMIO=y  CONFIG_REGMAP_IRQ=y  CONFIG_DMA_SHARED_BUFFER=y  # CONFIG_DMA_FENCE_TRACE is not set +# CONFIG_FW_DEVLINK_SYNC_STATE_TIMEOUT is not set  # end of Generic Driver Options  # @@ -1880,6 +1920,11 @@ CONFIG_DMA_SHARED_BUFFER=y  # CONFIG_MHI_BUS_EP is not set  # end of Bus devices +# +# Cache Drivers +# +# end of Cache Drivers +  # CONFIG_CONNECTOR is not set  # @@ -1909,11 +1954,8 @@ CONFIG_SYSFB=y  CONFIG_EFI_ESRT=y  CONFIG_EFI_VARS_PSTORE=m  # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set -CONFIG_EFI_RUNTIME_MAP=y -# CONFIG_EFI_FAKE_MEMMAP is not set  CONFIG_EFI_DXE_MEM_ATTRIBUTES=y  CONFIG_EFI_RUNTIME_WRAPPERS=y -CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y  # CONFIG_EFI_BOOTLOADER_CONTROL is not set  # CONFIG_EFI_CAPSULE_LOADER is not set  # CONFIG_EFI_TEST is not set @@ -1947,7 +1989,6 @@ CONFIG_GNSS=m  CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y  CONFIG_PARPORT=y  # CONFIG_PARPORT_PC is not set -# CONFIG_PARPORT_AX88796 is not set  # CONFIG_PARPORT_1284 is not set  CONFIG_PNP=y  # CONFIG_PNP_DEBUG_MESSAGES is not set @@ -2055,7 +2096,6 @@ CONFIG_VMWARE_VMCI=m  # CONFIG_MISC_ALCOR_PCI is not set  CONFIG_MISC_RTSX_PCI=m  CONFIG_MISC_RTSX_USB=m -# CONFIG_HABANA_AI is not set  # CONFIG_UACCE is not set  # CONFIG_PVPANIC is not set  # CONFIG_GP_PCI1XXXX is not set @@ -2296,6 +2336,7 @@ CONFIG_PATA_MPIIX=m  CONFIG_MD=y  CONFIG_BLK_DEV_MD=y  CONFIG_MD_AUTODETECT=y +CONFIG_MD_BITMAP_FILE=y  # CONFIG_MD_LINEAR is not set  CONFIG_MD_RAID0=y  CONFIG_MD_RAID1=y @@ -2406,6 +2447,7 @@ CONFIG_PCNET32=m  CONFIG_AMD_XGBE=m  # CONFIG_AMD_XGBE_DCB is not set  CONFIG_AMD_XGBE_HAVE_ECC=y +# CONFIG_PDS_CORE is not set  CONFIG_NET_VENDOR_AQUANTIA=y  CONFIG_AQTION=m  # CONFIG_NET_VENDOR_ARC is not set @@ -2443,6 +2485,7 @@ CONFIG_NET_VENDOR_CAVIUM=y  # CONFIG_THUNDER_NIC_BGX is not set  # CONFIG_THUNDER_NIC_RGX is not set  CONFIG_CAVIUM_PTP=y +CONFIG_LIQUIDIO_CORE=m  CONFIG_LIQUIDIO=m  # CONFIG_LIQUIDIO_VF is not set  CONFIG_NET_VENDOR_CHELSIO=y @@ -2491,7 +2534,6 @@ CONFIG_IGB=m  CONFIG_IGB_HWMON=y  CONFIG_IGB_DCA=y  CONFIG_IGBVF=m -CONFIG_IXGB=m  CONFIG_IXGBE=m  CONFIG_IXGBE_HWMON=y  CONFIG_IXGBE_DCA=y @@ -2508,9 +2550,6 @@ CONFIG_ICE_SWITCHDEV=y  CONFIG_ICE_HWTS=y  # CONFIG_FM10K is not set  CONFIG_IGC=m -CONFIG_NET_VENDOR_WANGXUN=y -# CONFIG_NGBE is not set -# CONFIG_TXGBE is not set  CONFIG_JME=m  CONFIG_NET_VENDOR_LITEX=y  CONFIG_NET_VENDOR_MARVELL=y @@ -2537,11 +2576,9 @@ CONFIG_MLX5_EN_RXNFC=y  CONFIG_MLX5_MPFS=y  CONFIG_MLX5_ESWITCH=y  CONFIG_MLX5_BRIDGE=y -CONFIG_MLX5_CLS_ACT=y -CONFIG_MLX5_TC_SAMPLE=y  CONFIG_MLX5_CORE_EN_DCB=y  # CONFIG_MLX5_CORE_IPOIB is not set -# CONFIG_MLX5_EN_MACSEC is not set +# CONFIG_MLX5_MACSEC is not set  CONFIG_MLX5_EN_IPSEC=y  CONFIG_MLX5_EN_TLS=y  CONFIG_MLX5_SW_STEERING=y @@ -2562,6 +2599,7 @@ CONFIG_NET_VENDOR_MICREL=y  CONFIG_KSZ884X_PCI=m  CONFIG_NET_VENDOR_MICROCHIP=y  # CONFIG_LAN743X is not set +# CONFIG_VCAP is not set  CONFIG_NET_VENDOR_MICROSEMI=y  CONFIG_NET_VENDOR_MICROSOFT=y  # CONFIG_MICROSOFT_MANA is not set @@ -2633,7 +2671,6 @@ CONFIG_STMMAC_ETH=m  CONFIG_STMMAC_PLATFORM=m  CONFIG_DWMAC_GENERIC=m  CONFIG_DWMAC_INTEL=m -# CONFIG_DWMAC_LOONGSON is not set  CONFIG_STMMAC_PCI=m  # CONFIG_NET_VENDOR_SUN is not set  CONFIG_NET_VENDOR_SYNOPSYS=y @@ -2648,6 +2685,9 @@ CONFIG_NET_VENDOR_VIA=y  CONFIG_VIA_RHINE=m  # CONFIG_VIA_RHINE_MMIO is not set  CONFIG_VIA_VELOCITY=m +CONFIG_NET_VENDOR_WANGXUN=y +# CONFIG_NGBE is not set +# CONFIG_TXGBE is not set  # CONFIG_NET_VENDOR_WIZNET is not set  # CONFIG_NET_VENDOR_XILINX is not set  # CONFIG_FDDI is not set @@ -2683,17 +2723,21 @@ CONFIG_INTEL_XWAY_PHY=m  CONFIG_LSI_ET1011C_PHY=m  CONFIG_MARVELL_PHY=m  CONFIG_MARVELL_10G_PHY=m +# CONFIG_MARVELL_88Q2XXX_PHY is not set  # CONFIG_MARVELL_88X2222_PHY is not set  # CONFIG_MAXLINEAR_GPHY is not set  # CONFIG_MEDIATEK_GE_PHY is not set  CONFIG_MICREL_PHY=m +# CONFIG_MICROCHIP_T1S_PHY is not set  CONFIG_MICROCHIP_PHY=m  CONFIG_MICROCHIP_T1_PHY=m  CONFIG_MICROSEMI_PHY=m  # CONFIG_MOTORCOMM_PHY is not set  CONFIG_NATIONAL_PHY=m +# CONFIG_NXP_CBTX_PHY is not set  # CONFIG_NXP_C45_TJA11XX_PHY is not set  # CONFIG_NXP_TJA11XX_PHY is not set +# CONFIG_NCN26000_PHY is not set  CONFIG_AT803X_PHY=m  CONFIG_QSEMI_PHY=m  CONFIG_REALTEK_PHY=m @@ -2740,6 +2784,11 @@ CONFIG_PPP_FILTER=y  CONFIG_PPP_MPPE=m  CONFIG_PPP_MULTILINK=y  CONFIG_PPPOE=m +# CONFIG_PPPOE_HASH_BITS_1 is not set +# CONFIG_PPPOE_HASH_BITS_2 is not set +CONFIG_PPPOE_HASH_BITS_4=y +# CONFIG_PPPOE_HASH_BITS_8 is not set +CONFIG_PPPOE_HASH_BITS=4  CONFIG_PPTP=m  CONFIG_PPPOL2TP=m  CONFIG_PPP_ASYNC=m @@ -2840,6 +2889,7 @@ CONFIG_ATH10K_USB=m  CONFIG_ATH10K_DFS_CERTIFIED=y  # CONFIG_WCN36XX is not set  # CONFIG_ATH11K is not set +# CONFIG_ATH12K is not set  # CONFIG_WLAN_VENDOR_ATMEL is not set  CONFIG_WLAN_VENDOR_BROADCOM=y  CONFIG_B43=m @@ -2945,6 +2995,7 @@ CONFIG_MT7915E=m  # CONFIG_MT7921E is not set  # CONFIG_MT7921S is not set  # CONFIG_MT7921U is not set +# CONFIG_MT7996E is not set  CONFIG_WLAN_VENDOR_MICROCHIP=y  # CONFIG_WILC1000_SDIO is not set  CONFIG_WLAN_VENDOR_PURELIFI=y @@ -3014,8 +3065,8 @@ CONFIG_WLAN_VENDOR_SILABS=y  # CONFIG_WLAN_VENDOR_TI is not set  # CONFIG_WLAN_VENDOR_ZYDAS is not set  # CONFIG_WLAN_VENDOR_QUANTENNA is not set -CONFIG_MAC80211_HWSIM=m  # CONFIG_USB_NET_RNDIS_WLAN is not set +CONFIG_MAC80211_HWSIM=m  # CONFIG_VIRT_WIFI is not set  # CONFIG_WAN is not set @@ -3158,6 +3209,7 @@ CONFIG_HW_CONSOLE=y  CONFIG_VT_HW_CONSOLE_BINDING=y  CONFIG_UNIX98_PTYS=y  # CONFIG_LEGACY_PTYS is not set +CONFIG_LEGACY_TIOCSTI=y  CONFIG_LDISC_AUTOLOAD=y  # @@ -3171,12 +3223,14 @@ CONFIG_SERIAL_8250_PNP=y  CONFIG_SERIAL_8250_FINTEK=y  CONFIG_SERIAL_8250_CONSOLE=y  CONFIG_SERIAL_8250_DMA=y +CONFIG_SERIAL_8250_PCILIB=y  CONFIG_SERIAL_8250_PCI=y  CONFIG_SERIAL_8250_EXAR=y  CONFIG_SERIAL_8250_NR_UARTS=32  CONFIG_SERIAL_8250_RUNTIME_UARTS=4  CONFIG_SERIAL_8250_EXTENDED=y  CONFIG_SERIAL_8250_MANY_PORTS=y +# CONFIG_SERIAL_8250_PCI1XXXX is not set  CONFIG_SERIAL_8250_SHARE_IRQ=y  # CONFIG_SERIAL_8250_DETECT_IRQ is not set  CONFIG_SERIAL_8250_RSA=y @@ -3211,7 +3265,6 @@ CONFIG_SERIAL_MCTRL_GPIO=y  CONFIG_SERIAL_NONSTANDARD=y  CONFIG_MOXA_INTELLIO=m  CONFIG_MOXA_SMARTIO=m -CONFIG_SYNCLINK_GT=m  CONFIG_N_HDLC=m  CONFIG_N_GSM=m  CONFIG_NOZOMI=m @@ -3237,6 +3290,7 @@ CONFIG_IPMI_SI=m  # CONFIG_IPMI_IPMB is not set  CONFIG_IPMI_WATCHDOG=m  CONFIG_IPMI_POWEROFF=m +# CONFIG_SSIF_IPMI_BMC is not set  # CONFIG_IPMB_DEVICE_INTERFACE is not set  CONFIG_HW_RANDOM=m  # CONFIG_HW_RANDOM_TIMERIOMEM is not set @@ -3275,8 +3329,6 @@ CONFIG_TCG_TIS_ST33ZP24_I2C=m  # CONFIG_TELCLOCK is not set  # CONFIG_XILLYBUS is not set  # CONFIG_XILLYUSB is not set -# CONFIG_RANDOM_TRUST_CPU is not set -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set  # end of Character devices  # @@ -3346,7 +3398,6 @@ CONFIG_I2C_SCMI=m  CONFIG_I2C_DESIGNWARE_CORE=y  # CONFIG_I2C_DESIGNWARE_SLAVE is not set  CONFIG_I2C_DESIGNWARE_PLATFORM=y -# CONFIG_I2C_DESIGNWARE_AMDPSP is not set  # CONFIG_I2C_DESIGNWARE_BAYTRAIL is not set  CONFIG_I2C_DESIGNWARE_PCI=m  # CONFIG_I2C_EMEV2 is not set @@ -3416,6 +3467,7 @@ CONFIG_PTP_1588_CLOCK_OPTIONAL=y  CONFIG_PTP_1588_CLOCK_KVM=y  # CONFIG_PTP_1588_CLOCK_IDT82P33 is not set  # CONFIG_PTP_1588_CLOCK_IDTCM is not set +# CONFIG_PTP_1588_CLOCK_MOCK is not set  # CONFIG_PTP_1588_CLOCK_VMW is not set  # end of PTP clock support @@ -3477,13 +3529,13 @@ CONFIG_GPIO_AMDPT=m  # CONFIG_GPIO_GENERIC_PLATFORM is not set  # CONFIG_GPIO_ICH is not set  # CONFIG_GPIO_MB86S7X is not set -# CONFIG_GPIO_VX855 is not set  CONFIG_GPIO_AMD_FCH=m  # end of Memory mapped GPIO drivers  #  # Port-mapped I/O GPIO drivers  # +# CONFIG_GPIO_VX855 is not set  # CONFIG_GPIO_F7188X is not set  # CONFIG_GPIO_IT87 is not set  # CONFIG_GPIO_SCH is not set @@ -3495,6 +3547,8 @@ CONFIG_GPIO_AMD_FCH=m  #  # I2C GPIO expanders  # +# CONFIG_GPIO_FXL6408 is not set +# CONFIG_GPIO_DS4520 is not set  # CONFIG_GPIO_MAX7300 is not set  # CONFIG_GPIO_MAX732X is not set  # CONFIG_GPIO_PCA953X is not set @@ -3506,6 +3560,7 @@ CONFIG_GPIO_AMD_FCH=m  #  # MFD GPIO expanders  # +# CONFIG_GPIO_ELKHARTLAKE is not set  CONFIG_GPIO_KEMPLD=m  # end of MFD GPIO expanders @@ -3530,6 +3585,7 @@ CONFIG_GPIO_VIPERBOARD=m  # Virtual GPIO drivers  #  # CONFIG_GPIO_AGGREGATOR is not set +# CONFIG_GPIO_LATCH is not set  # CONFIG_GPIO_MOCKUP is not set  # CONFIG_GPIO_VIRTIO is not set  # CONFIG_GPIO_SIM is not set @@ -3543,7 +3599,6 @@ CONFIG_W1=m  CONFIG_W1_MASTER_MATROX=m  CONFIG_W1_MASTER_DS2490=m  CONFIG_W1_MASTER_DS2482=m -CONFIG_W1_MASTER_DS1WM=m  CONFIG_W1_MASTER_GPIO=m  # CONFIG_W1_MASTER_SGI is not set  # end of 1-wire Bus Masters @@ -3576,7 +3631,6 @@ CONFIG_W1_SLAVE_DS28E17=m  CONFIG_POWER_SUPPLY=y  # CONFIG_POWER_SUPPLY_DEBUG is not set  CONFIG_POWER_SUPPLY_HWMON=y -# CONFIG_PDA_POWER is not set  # CONFIG_IP5XXX_POWER is not set  # CONFIG_TEST_POWER is not set  # CONFIG_CHARGER_ADP5061 is not set @@ -3614,6 +3668,8 @@ CONFIG_BATTERY_MAX17042=m  # CONFIG_BATTERY_GOLDFISH is not set  # CONFIG_BATTERY_RT5033 is not set  # CONFIG_CHARGER_RT9455 is not set +# CONFIG_CHARGER_RT9467 is not set +# CONFIG_CHARGER_RT9471 is not set  # CONFIG_CHARGER_BD99954 is not set  # CONFIG_BATTERY_UG3105 is not set  CONFIG_HWMON=y @@ -3668,6 +3724,7 @@ CONFIG_SENSORS_GL520SM=m  CONFIG_SENSORS_G760A=m  CONFIG_SENSORS_G762=m  CONFIG_SENSORS_HIH6130=m +# CONFIG_SENSORS_HS3001 is not set  CONFIG_SENSORS_IBMAEM=m  CONFIG_SENSORS_IBMPEX=m  CONFIG_SENSORS_I5500=m @@ -3693,12 +3750,14 @@ CONFIG_SENSORS_MAX1668=m  CONFIG_SENSORS_MAX197=m  # CONFIG_SENSORS_MAX31730 is not set  # CONFIG_SENSORS_MAX31760 is not set +# CONFIG_MAX31827 is not set  # CONFIG_SENSORS_MAX6620 is not set  CONFIG_SENSORS_MAX6621=m  CONFIG_SENSORS_MAX6639=m  CONFIG_SENSORS_MAX6650=m  CONFIG_SENSORS_MAX6697=m  CONFIG_SENSORS_MAX31790=m +# CONFIG_SENSORS_MC34VR500 is not set  CONFIG_SENSORS_MCP3021=m  CONFIG_SENSORS_TC654=m  # CONFIG_SENSORS_TPS23861 is not set @@ -3730,9 +3789,12 @@ CONFIG_SENSORS_NCT7904=m  CONFIG_SENSORS_NPCM7XX=m  # CONFIG_SENSORS_NZXT_KRAKEN2 is not set  # CONFIG_SENSORS_NZXT_SMART2 is not set +# CONFIG_SENSORS_OCC_P8_I2C is not set +# CONFIG_SENSORS_OXP is not set  CONFIG_SENSORS_PCF8591=m  CONFIG_PMBUS=m  CONFIG_SENSORS_PMBUS=m +# CONFIG_SENSORS_ACBEL_FSG032 is not set  # CONFIG_SENSORS_ADM1266 is not set  CONFIG_SENSORS_ADM1275=m  # CONFIG_SENSORS_BEL_PFE is not set @@ -3764,12 +3826,14 @@ CONFIG_SENSORS_MAX8688=m  # CONFIG_SENSORS_MP2888 is not set  # CONFIG_SENSORS_MP2975 is not set  # CONFIG_SENSORS_MP5023 is not set +# CONFIG_SENSORS_MPQ7932 is not set  # CONFIG_SENSORS_PIM4328 is not set  # CONFIG_SENSORS_PLI1209BC is not set  # CONFIG_SENSORS_PM6764TR is not set  # CONFIG_SENSORS_PXE1610 is not set  # CONFIG_SENSORS_Q54SJ108A2 is not set  # CONFIG_SENSORS_STPDDC60 is not set +# CONFIG_SENSORS_TDA38640 is not set  CONFIG_SENSORS_TPS40422=m  CONFIG_SENSORS_TPS53679=m  # CONFIG_SENSORS_TPS546D24 is not set @@ -3798,7 +3862,6 @@ CONFIG_SENSORS_SCH56XX_COMMON=m  CONFIG_SENSORS_SCH5627=m  CONFIG_SENSORS_SCH5636=m  CONFIG_SENSORS_STTS751=m -CONFIG_SENSORS_SMM665=m  CONFIG_SENSORS_ADC128D818=m  CONFIG_SENSORS_ADS7828=m  CONFIG_SENSORS_AMC6821=m @@ -3843,10 +3906,12 @@ CONFIG_THERMAL=y  # CONFIG_THERMAL_STATISTICS is not set  CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0  CONFIG_THERMAL_HWMON=y +CONFIG_THERMAL_ACPI=y  CONFIG_THERMAL_WRITABLE_TRIPS=y  CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y  # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set  # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +# CONFIG_THERMAL_DEFAULT_GOV_BANG_BANG is not set  CONFIG_THERMAL_GOV_FAIR_SHARE=y  CONFIG_THERMAL_GOV_STEP_WISE=y  CONFIG_THERMAL_GOV_BANG_BANG=y @@ -3859,6 +3924,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y  #  CONFIG_INTEL_POWERCLAMP=m  CONFIG_X86_THERMAL_VECTOR=y +CONFIG_INTEL_TCC=y  CONFIG_X86_PKG_TEMP_THERMAL=m  CONFIG_INTEL_SOC_DTS_IOSF_CORE=m  CONFIG_INTEL_SOC_DTS_THERMAL=m @@ -3868,11 +3934,11 @@ CONFIG_INTEL_SOC_DTS_THERMAL=m  #  CONFIG_INT340X_THERMAL=m  CONFIG_ACPI_THERMAL_REL=m +CONFIG_PROC_THERMAL_MMIO_RAPL=m  # end of ACPI INT340X thermal drivers  CONFIG_INTEL_PCH_THERMAL=m  # CONFIG_INTEL_TCC_COOLING is not set -# CONFIG_INTEL_MENLOW is not set  # CONFIG_INTEL_HFI_THERMAL is not set  # end of Intel thermal drivers @@ -3902,6 +3968,7 @@ CONFIG_MENF21BMC_WATCHDOG=m  # CONFIG_MAX63XX_WATCHDOG is not set  CONFIG_ACQUIRE_WDT=m  CONFIG_ADVANTECH_WDT=m +# CONFIG_ADVANTECH_EC_WDT is not set  CONFIG_ALIM1535_WDT=m  CONFIG_ALIM7101_WDT=m  # CONFIG_EBC_C384_WDT is not set @@ -3980,12 +4047,14 @@ CONFIG_BCMA_DRIVER_PCI=y  #  CONFIG_MFD_CORE=y  # CONFIG_MFD_AS3711 is not set +# CONFIG_MFD_SMPRO is not set  # CONFIG_PMIC_ADP5520 is not set  # CONFIG_MFD_AAT2870_CORE is not set  # CONFIG_MFD_BCM590XX is not set  # CONFIG_MFD_BD9571MWV is not set  CONFIG_MFD_AXP20X=m  CONFIG_MFD_AXP20X_I2C=m +# CONFIG_MFD_CS42L43_I2C is not set  # CONFIG_MFD_MADERA is not set  # CONFIG_PMIC_DA903X is not set  # CONFIG_MFD_DA9052_I2C is not set @@ -3996,8 +4065,6 @@ CONFIG_MFD_AXP20X_I2C=m  # CONFIG_MFD_DLN2 is not set  # CONFIG_MFD_MC13XXX_I2C is not set  # CONFIG_MFD_MP2629 is not set -# CONFIG_HTC_PASIC3 is not set -# CONFIG_HTC_I2CPLD is not set  # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set  CONFIG_LPC_ICH=m  CONFIG_LPC_SCH=m @@ -4015,6 +4082,7 @@ CONFIG_MFD_KEMPLD=m  # CONFIG_MFD_88PM805 is not set  # CONFIG_MFD_88PM860X is not set  # CONFIG_MFD_MAX14577 is not set +# CONFIG_MFD_MAX77541 is not set  # CONFIG_MFD_MAX77693 is not set  # CONFIG_MFD_MAX77843 is not set  # CONFIG_MFD_MAX8907 is not set @@ -4052,6 +4120,7 @@ CONFIG_MFD_SYSCON=y  # CONFIG_MFD_TPS6586X is not set  # CONFIG_MFD_TPS65910 is not set  # CONFIG_MFD_TPS65912_I2C is not set +# CONFIG_MFD_TPS6594_I2C is not set  # CONFIG_TWL4030_CORE is not set  # CONFIG_TWL6040_CORE is not set  # CONFIG_MFD_WL1273_CORE is not set @@ -4075,6 +4144,7 @@ CONFIG_REGULATOR_USERSPACE_CONSUMER=m  CONFIG_REGULATOR_88PG86X=m  CONFIG_REGULATOR_ACT8865=m  CONFIG_REGULATOR_AD5398=m +# CONFIG_REGULATOR_AW37503 is not set  CONFIG_REGULATOR_AXP20X=m  CONFIG_REGULATOR_DA9210=m  CONFIG_REGULATOR_DA9211=m @@ -4089,11 +4159,13 @@ CONFIG_REGULATOR_LP8755=m  CONFIG_REGULATOR_LTC3589=m  CONFIG_REGULATOR_LTC3676=m  CONFIG_REGULATOR_MAX1586=m +# CONFIG_REGULATOR_MAX77857 is not set  CONFIG_REGULATOR_MAX8649=m  CONFIG_REGULATOR_MAX8660=m  # CONFIG_REGULATOR_MAX8893 is not set  CONFIG_REGULATOR_MAX8952=m  # CONFIG_REGULATOR_MAX20086 is not set +# CONFIG_REGULATOR_MAX20411 is not set  # CONFIG_REGULATOR_MAX77826 is not set  # CONFIG_REGULATOR_MP8859 is not set  CONFIG_REGULATOR_MT6311=m @@ -4101,14 +4173,19 @@ CONFIG_REGULATOR_MT6311=m  CONFIG_REGULATOR_PV88060=m  CONFIG_REGULATOR_PV88080=m  CONFIG_REGULATOR_PV88090=m +# CONFIG_REGULATOR_RAA215300 is not set  # CONFIG_REGULATOR_RT4801 is not set +# CONFIG_REGULATOR_RT4803 is not set  # CONFIG_REGULATOR_RT5190A is not set +# CONFIG_REGULATOR_RT5739 is not set  # CONFIG_REGULATOR_RT5759 is not set  # CONFIG_REGULATOR_RT6160 is not set +# CONFIG_REGULATOR_RT6190 is not set  # CONFIG_REGULATOR_RT6245 is not set  # CONFIG_REGULATOR_RTQ2134 is not set  # CONFIG_REGULATOR_RTMV20 is not set  # CONFIG_REGULATOR_RTQ6752 is not set +# CONFIG_REGULATOR_RTQ2208 is not set  # CONFIG_REGULATOR_SLG51000 is not set  CONFIG_REGULATOR_TPS51632=m  CONFIG_REGULATOR_TPS62360=m @@ -4129,35 +4206,19 @@ CONFIG_REGULATOR_TPS65132=m  # Graphics support  #  CONFIG_APERTURE_HELPERS=y +CONFIG_VIDEO_CMDLINE=y +# CONFIG_AUXDISPLAY is not set +# CONFIG_PANEL is not set  # CONFIG_AGP is not set  # CONFIG_VGA_SWITCHEROO is not set  # CONFIG_DRM is not set  # CONFIG_DRM_DEBUG_MODESET_LOCK is not set - -# -# ARM devices -# -# end of ARM devices -  CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y  #  # Frame buffer Devices  # -CONFIG_FB_CMDLINE=y -CONFIG_FB_NOTIFY=y  CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -# CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_MODE_HELPERS is not set -# CONFIG_FB_TILEBLITTING is not set - -# -# Frame buffer hardware drivers -#  # CONFIG_FB_CIRRUS is not set  # CONFIG_FB_PM2 is not set  # CONFIG_FB_CYBER2000 is not set @@ -4203,6 +4264,17 @@ CONFIG_FB_EFI=y  # CONFIG_FB_SIMPLE is not set  # CONFIG_FB_SSD1307 is not set  # CONFIG_FB_SM712 is not set +CONFIG_FB_CORE=y +CONFIG_FB_NOTIFY=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_DEVICE=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_IOMEM_HELPERS=y +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set  # end of Frame buffer Devices  # @@ -4230,10 +4302,7 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y  # end of Graphics support  # CONFIG_SOUND is not set - -# -# HID support -# +CONFIG_HID_SUPPORT=y  CONFIG_HID=m  CONFIG_HID_BATTERY_STRENGTH=y  CONFIG_HIDRAW=y @@ -4267,12 +4336,14 @@ CONFIG_HID_GENERIC=m  # CONFIG_HID_ELAN is not set  # CONFIG_HID_ELECOM is not set  # CONFIG_HID_ELO is not set +# CONFIG_HID_EVISION is not set  # CONFIG_HID_EZKEY is not set  # CONFIG_HID_FT260 is not set  # CONFIG_HID_GEMBIRD is not set  # CONFIG_HID_GFRM is not set  # CONFIG_HID_GLORIOUS is not set  # CONFIG_HID_HOLTEK is not set +# CONFIG_HID_GOOGLE_STADIA_FF is not set  # CONFIG_HID_VIVALDI is not set  # CONFIG_HID_GT683R is not set  # CONFIG_HID_KEYTOUCH is not set @@ -4346,6 +4417,11 @@ CONFIG_HID_GENERIC=m  # end of Special HID drivers  # +# HID-BPF support +# +# end of HID-BPF support + +#  # USB HID support  #  CONFIG_USB_HID=m @@ -4360,11 +4436,9 @@ CONFIG_USB_HIDDEV=y  # end of USB HID Boot Protocol drivers  # end of USB HID support -# -# I2C HID support -# +CONFIG_I2C_HID=m  # CONFIG_I2C_HID_ACPI is not set -# end of I2C HID support +# CONFIG_I2C_HID_OF is not set  #  # Intel ISH HID support @@ -4377,7 +4451,6 @@ CONFIG_USB_HIDDEV=y  #  # CONFIG_AMD_SFH_HID is not set  # end of AMD SFH HID Support -# end of HID support  CONFIG_USB_OHCI_LITTLE_ENDIAN=y  CONFIG_USB_SUPPORT=y @@ -4420,7 +4493,6 @@ CONFIG_USB_EHCI_PCI=m  # CONFIG_USB_EHCI_HCD_PLATFORM is not set  # CONFIG_USB_OXU210HP_HCD is not set  # CONFIG_USB_ISP116X_HCD is not set -# CONFIG_USB_FOTG210_HCD is not set  CONFIG_USB_OHCI_HCD=m  CONFIG_USB_OHCI_HCD_PCI=m  # CONFIG_USB_OHCI_HCD_SSB is not set @@ -4472,6 +4544,10 @@ CONFIG_USB_STORAGE=m  # CONFIG_USB_MDC800 is not set  # CONFIG_USB_MICROTEK is not set  # CONFIG_USBIP_CORE is not set + +# +# USB dual-mode controller drivers +#  # CONFIG_USB_CDNS_SUPPORT is not set  # CONFIG_USB_MUSB_HDRC is not set  # CONFIG_USB_DWC3 is not set @@ -4482,7 +4558,6 @@ CONFIG_USB_STORAGE=m  #  # USB port drivers  # -# CONFIG_USB_USS720 is not set  CONFIG_USB_SERIAL=m  CONFIG_USB_SERIAL_GENERIC=y  CONFIG_USB_SERIAL_SIMPLE=m @@ -4543,6 +4618,7 @@ CONFIG_USB_SERIAL_UPD78F0730=m  #  # USB Miscellaneous drivers  # +# CONFIG_USB_USS720 is not set  # CONFIG_USB_EMI62 is not set  # CONFIG_USB_EMI26 is not set  # CONFIG_USB_ADUTUX is not set @@ -4552,7 +4628,6 @@ CONFIG_USB_SERIAL_UPD78F0730=m  # CONFIG_USB_CYPRESS_CY7C63 is not set  # CONFIG_USB_CYTHERM is not set  # CONFIG_USB_IDMOUSE is not set -# CONFIG_USB_FTDI_ELAN is not set  # CONFIG_USB_APPLEDISPLAY is not set  # CONFIG_APPLE_MFI_FASTCHARGE is not set  # CONFIG_USB_SISUSBVGA is not set @@ -4614,7 +4689,6 @@ CONFIG_MMC_MTK=m  CONFIG_MMC_SDHCI_XENON=m  CONFIG_SCSI_UFSHCD=m  # CONFIG_SCSI_UFS_BSG is not set -# CONFIG_SCSI_UFS_HPB is not set  # CONFIG_SCSI_UFS_HWMON is not set  CONFIG_SCSI_UFSHCD_PCI=m  # CONFIG_SCSI_UFS_DWC_TC_PCI is not set @@ -4630,6 +4704,8 @@ CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y  # LED drivers  #  # CONFIG_LEDS_APU is not set +# CONFIG_LEDS_AW200XX is not set +# CONFIG_LEDS_CHT_WCOVE is not set  CONFIG_LEDS_LM3530=m  # CONFIG_LEDS_LM3532 is not set  CONFIG_LEDS_LM3642=m @@ -4642,7 +4718,9 @@ CONFIG_LEDS_LP3952=m  CONFIG_LEDS_PCA955X=m  # CONFIG_LEDS_PCA955X_GPIO is not set  CONFIG_LEDS_PCA963X=m +# CONFIG_LEDS_PCA995X is not set  CONFIG_LEDS_REGULATOR=m +# CONFIG_LEDS_BD2606MVV is not set  CONFIG_LEDS_BD2802=m  CONFIG_LEDS_INTEL_SS4200=m  # CONFIG_LEDS_LT3593 is not set @@ -4660,7 +4738,6 @@ CONFIG_LEDS_MLXCPLD=m  CONFIG_LEDS_MLXREG=m  # CONFIG_LEDS_USER is not set  CONFIG_LEDS_NIC78BX=m -# CONFIG_LEDS_TI_LMU_COMMON is not set  #  # Flash and Torch LED drivers @@ -4685,7 +4762,6 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m  CONFIG_LEDS_TRIGGER_BACKLIGHT=m  CONFIG_LEDS_TRIGGER_CPU=y  CONFIG_LEDS_TRIGGER_ACTIVITY=m -CONFIG_LEDS_TRIGGER_GPIO=m  CONFIG_LEDS_TRIGGER_DEFAULT_ON=m  # @@ -4721,7 +4797,6 @@ CONFIG_EDAC_IE31200=m  CONFIG_EDAC_X38=m  CONFIG_EDAC_I5400=m  CONFIG_EDAC_I7CORE=m -CONFIG_EDAC_I5000=m  CONFIG_EDAC_I5100=m  CONFIG_EDAC_I7300=m  CONFIG_EDAC_SBRIDGE=m @@ -4808,9 +4883,7 @@ CONFIG_RTC_DRV_CMOS=y  # CONFIG_RTC_DRV_M48T35 is not set  # CONFIG_RTC_DRV_M48T59 is not set  # CONFIG_RTC_DRV_MSM6242 is not set -# CONFIG_RTC_DRV_BQ4802 is not set  # CONFIG_RTC_DRV_RP5C01 is not set -# CONFIG_RTC_DRV_V3020 is not set  #  # on-CPU RTC drivers @@ -4839,13 +4912,14 @@ CONFIG_INTEL_IDXD=y  # CONFIG_INTEL_IDXD_PERFMON is not set  CONFIG_INTEL_IOATDMA=y  # CONFIG_PLX_DMA is not set +# CONFIG_XILINX_DMA is not set +# CONFIG_XILINX_XDMA is not set  # CONFIG_AMD_PTDMA is not set  # CONFIG_QCOM_HIDMA_MGMT is not set  # CONFIG_QCOM_HIDMA is not set  # CONFIG_DW_DMAC is not set  # CONFIG_DW_DMAC_PCI is not set  # CONFIG_DW_EDMA is not set -# CONFIG_DW_EDMA_PCIE is not set  CONFIG_HSU_DMA=y  # CONFIG_SF_PDMA is not set  # CONFIG_INTEL_LDMA is not set @@ -4871,8 +4945,6 @@ CONFIG_SYNC_FILE=y  # end of DMABUF options  CONFIG_DCA=y -# CONFIG_AUXDISPLAY is not set -# CONFIG_PANEL is not set  CONFIG_UIO=m  # CONFIG_UIO_CIF is not set  # CONFIG_UIO_PDRV_GENIRQ is not set @@ -4885,9 +4957,24 @@ CONFIG_UIO_PCI_GENERIC=m  # CONFIG_UIO_MF624 is not set  # CONFIG_UIO_HV_GENERIC is not set  CONFIG_VFIO=m +CONFIG_VFIO_GROUP=y +CONFIG_VFIO_CONTAINER=y +CONFIG_VFIO_IOMMU_TYPE1=m +# CONFIG_VFIO_NOIOMMU is not set +CONFIG_VFIO_VIRQFD=y + +# +# VFIO support for PCI devices +# +CONFIG_VFIO_PCI_CORE=m +CONFIG_VFIO_PCI_MMAP=y +CONFIG_VFIO_PCI_INTX=y  CONFIG_VFIO_PCI=m -CONFIG_VFIO_MDEV=m +CONFIG_VFIO_PCI_IGD=y  CONFIG_MLX5_VFIO_PCI=m +# end of VFIO support for PCI devices + +CONFIG_IRQ_BYPASS_MANAGER=m  # CONFIG_VIRT_DRIVERS is not set  CONFIG_VIRTIO_ANCHOR=y  CONFIG_VIRTIO=m @@ -4904,6 +4991,7 @@ CONFIG_VIRTIO_MMIO=m  CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y  # CONFIG_VDPA is not set  CONFIG_VHOST_IOTLB=m +CONFIG_VHOST_TASK=y  CONFIG_VHOST=m  CONFIG_VHOST_MENU=y  CONFIG_VHOST_NET=m @@ -4914,6 +5002,7 @@ CONFIG_VHOST_VSOCK=m  # Microsoft Hyper-V guest support  #  CONFIG_HYPERV=m +# CONFIG_HYPERV_VTL_MODE is not set  CONFIG_HYPERV_TIMER=y  CONFIG_HYPERV_BALLOON=m  # end of Microsoft Hyper-V guest support @@ -4982,6 +5071,7 @@ CONFIG_X86_PLATFORM_DEVICES=y  # CONFIG_SENSORS_HDAPS is not set  # CONFIG_INTEL_ATOMISP2_LED is not set  # CONFIG_INTEL_ATOMISP2_PM is not set +# CONFIG_INTEL_IFS is not set  # CONFIG_INTEL_SAR_INT1092 is not set  # CONFIG_INTEL_SKL_INT3472 is not set  # CONFIG_INTEL_PMC_CORE is not set @@ -5019,6 +5109,7 @@ CONFIG_X86_PLATFORM_DEVICES=y  # CONFIG_INTEL_SCU_PLATFORM is not set  # CONFIG_SIEMENS_SIMATIC_IPC is not set  # CONFIG_WINMATE_FM07_KEYS is not set +# CONFIG_SEL3350_PLATFORM is not set  CONFIG_P2SB=y  CONFIG_HAVE_CLK=y  CONFIG_HAVE_CLK_PREPARE=y @@ -5044,7 +5135,6 @@ CONFIG_MAILBOX=y  CONFIG_PCC=y  # CONFIG_ALTERA_MBOX is not set  CONFIG_IOMMU_IOVA=y -CONFIG_IOASID=y  CONFIG_IOMMU_API=y  CONFIG_IOMMU_SUPPORT=y @@ -5068,6 +5158,8 @@ CONFIG_INTEL_IOMMU_SVM=y  # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set  CONFIG_INTEL_IOMMU_FLOPPY_WA=y  # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set +CONFIG_INTEL_IOMMU_PERF_EVENTS=y +# CONFIG_IOMMUFD is not set  CONFIG_IRQ_REMAP=y  CONFIG_HYPERV_IOMMU=y  # CONFIG_VIRTIO_IOMMU is not set @@ -5121,6 +5213,8 @@ CONFIG_HYPERV_IOMMU=y  #  # end of Enable LiteX SoC Builder specific drivers +# CONFIG_WPCM450_SOC is not set +  #  # Qualcomm SoC drivers  # @@ -5184,7 +5278,10 @@ CONFIG_GENERIC_PHY=y  # CONFIG_PHY_INTEL_LGM_EMMC is not set  # end of PHY Subsystem -# CONFIG_POWERCAP is not set +CONFIG_POWERCAP=y +CONFIG_INTEL_RAPL_CORE=m +# CONFIG_INTEL_RAPL is not set +CONFIG_IDLE_INJECT=y  # CONFIG_MCB is not set  # @@ -5211,6 +5308,14 @@ CONFIG_DAX=y  # CONFIG_DEV_DAX is not set  CONFIG_NVMEM=y  CONFIG_NVMEM_SYSFS=y + +# +# Layout Types +# +# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set +# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set +# end of Layout Types +  # CONFIG_NVMEM_RMEM is not set  # @@ -5238,6 +5343,8 @@ CONFIG_PM_OPP=y  CONFIG_DCACHE_WORD_ACCESS=y  # CONFIG_VALIDATE_FS_PARSER is not set  CONFIG_FS_IOMAP=y +CONFIG_BUFFER_HEAD=y +CONFIG_LEGACY_DIRECT_IO=y  # CONFIG_EXT2_FS is not set  # CONFIG_EXT3_FS is not set  CONFIG_EXT4_FS=m @@ -5268,7 +5375,6 @@ CONFIG_INOTIFY_USER=y  CONFIG_INOTIFY_STACKFS=y  # CONFIG_FANOTIFY is not set  # CONFIG_QUOTA is not set -# CONFIG_AUTOFS4_FS is not set  CONFIG_AUTOFS_FS=m  CONFIG_FUSE_FS=m  CONFIG_CUSE=m @@ -5279,6 +5385,7 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y  # CONFIG_OVERLAY_FS_INDEX is not set  # CONFIG_OVERLAY_FS_XINO_AUTO is not set  # CONFIG_OVERLAY_FS_METACOPY is not set +# CONFIG_OVERLAY_FS_DEBUG is not set  #  # Caches @@ -5329,12 +5436,11 @@ CONFIG_TMPFS=y  CONFIG_TMPFS_POSIX_ACL=y  CONFIG_TMPFS_XATTR=y  # CONFIG_TMPFS_INODE64 is not set +# CONFIG_TMPFS_QUOTA is not set  CONFIG_HUGETLBFS=y  CONFIG_HUGETLB_PAGE=y -CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y  CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y  # CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set -CONFIG_MEMFD_CREATE=y  CONFIG_ARCH_HAS_GIGANTIC_PAGE=y  CONFIG_CONFIGFS_FS=m  CONFIG_EFIVAR_FS=m @@ -5355,8 +5461,10 @@ CONFIG_SQUASHFS=m  CONFIG_SQUASHFS_FILE_CACHE=y  # CONFIG_SQUASHFS_FILE_DIRECT is not set  CONFIG_SQUASHFS_DECOMP_SINGLE=y -# CONFIG_SQUASHFS_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set +# CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set +CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y +# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set +# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set  CONFIG_SQUASHFS_XATTR=y  CONFIG_SQUASHFS_ZLIB=y  CONFIG_SQUASHFS_LZ4=y @@ -5375,12 +5483,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3  # CONFIG_ROMFS_FS is not set  CONFIG_PSTORE=y  CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240 -# CONFIG_PSTORE_DEFLATE_COMPRESS is not set -# CONFIG_PSTORE_LZO_COMPRESS is not set -# CONFIG_PSTORE_LZ4_COMPRESS is not set -# CONFIG_PSTORE_LZ4HC_COMPRESS is not set -# CONFIG_PSTORE_842_COMPRESS is not set -# CONFIG_PSTORE_ZSTD_COMPRESS is not set +CONFIG_PSTORE_COMPRESS=y  # CONFIG_PSTORE_CONSOLE is not set  # CONFIG_PSTORE_PMSG is not set  # CONFIG_PSTORE_RAM is not set @@ -5458,7 +5561,6 @@ CONFIG_SECURITY_DMESG_RESTRICT=y  # CONFIG_SECURITY is not set  CONFIG_SECURITYFS=y  # CONFIG_INTEL_TXT is not set -CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y  CONFIG_HARDENED_USERCOPY=y  CONFIG_FORTIFY_SOURCE=y  # CONFIG_STATIC_USERMODEHELPER is not set @@ -5485,6 +5587,13 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y  # CONFIG_ZERO_CALL_USED_REGS is not set  # end of Memory initialization +# +# Hardening of kernel data structures +# +CONFIG_LIST_HARDENED=y +CONFIG_BUG_ON_DATA_CORRUPTION=y +# end of Hardening of kernel data structures +  CONFIG_RANDSTRUCT_NONE=y  # end of Kernel hardening options  # end of Security options @@ -5504,6 +5613,7 @@ CONFIG_CRYPTO_ALGAPI=y  CONFIG_CRYPTO_ALGAPI2=y  CONFIG_CRYPTO_AEAD=y  CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_SIG2=y  CONFIG_CRYPTO_SKCIPHER=y  CONFIG_CRYPTO_SKCIPHER2=y  CONFIG_CRYPTO_HASH=y @@ -5520,7 +5630,6 @@ CONFIG_CRYPTO_MANAGER=y  CONFIG_CRYPTO_MANAGER2=y  CONFIG_CRYPTO_USER=m  CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y -CONFIG_CRYPTO_GF128MUL=y  CONFIG_CRYPTO_NULL=y  CONFIG_CRYPTO_NULL2=y  CONFIG_CRYPTO_PCRYPT=m @@ -5596,6 +5705,7 @@ CONFIG_CRYPTO_AEGIS128=m  CONFIG_CRYPTO_CHACHA20POLY1305=m  CONFIG_CRYPTO_CCM=m  CONFIG_CRYPTO_GCM=y +CONFIG_CRYPTO_GENIV=m  CONFIG_CRYPTO_SEQIV=m  CONFIG_CRYPTO_ECHAINIV=m  CONFIG_CRYPTO_ESSIV=y @@ -5655,6 +5765,7 @@ CONFIG_CRYPTO_DRBG_HMAC=y  # CONFIG_CRYPTO_DRBG_CTR is not set  CONFIG_CRYPTO_DRBG=m  CONFIG_CRYPTO_JITTERENTROPY=m +# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set  # end of Random number generation  # @@ -5693,6 +5804,8 @@ CONFIG_CRYPTO_TWOFISH_X86_64=m  CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m  CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m  # CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64 is not set +# CONFIG_CRYPTO_ARIA_AESNI_AVX2_X86_64 is not set +# CONFIG_CRYPTO_ARIA_GFNI_AVX512_X86_64 is not set  CONFIG_CRYPTO_CHACHA20_X86_64=m  CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m  CONFIG_CRYPTO_NHPOLY1305_SSE2=m @@ -5723,6 +5836,7 @@ CONFIG_CRYPTO_DEV_SP_CCP=y  CONFIG_CRYPTO_DEV_CCP_CRYPTO=m  CONFIG_CRYPTO_DEV_SP_PSP=y  # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set +# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set  CONFIG_CRYPTO_DEV_QAT=m  CONFIG_CRYPTO_DEV_QAT_DH895xCC=m  CONFIG_CRYPTO_DEV_QAT_C3XXX=m @@ -5731,7 +5845,6 @@ CONFIG_CRYPTO_DEV_QAT_C62X=m  CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m  CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m  CONFIG_CRYPTO_DEV_QAT_C62XVF=m -# CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set  # CONFIG_CRYPTO_DEV_CHELSIO is not set  CONFIG_CRYPTO_DEV_VIRTIO=m  # CONFIG_CRYPTO_DEV_SAFEXCEL is not set @@ -5783,6 +5896,7 @@ CONFIG_ARCH_USE_SYM_ANNOTATIONS=y  CONFIG_CRYPTO_LIB_UTILS=y  CONFIG_CRYPTO_LIB_AES=y  CONFIG_CRYPTO_LIB_ARC4=m +CONFIG_CRYPTO_LIB_GF128MUL=y  CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y  CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y  CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m @@ -5853,13 +5967,16 @@ CONFIG_INTERVAL_TREE=y  CONFIG_XARRAY_MULTI=y  CONFIG_ASSOCIATIVE_ARRAY=y  CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y  CONFIG_HAS_IOPORT_MAP=y  CONFIG_HAS_DMA=y  CONFIG_DMA_OPS=y +CONFIG_NEED_SG_DMA_FLAGS=y  CONFIG_NEED_SG_DMA_LENGTH=y  CONFIG_NEED_DMA_MAP_STATE=y  CONFIG_ARCH_DMA_ADDR_T_64BIT=y  CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB_DYNAMIC is not set  # CONFIG_DMA_CMA is not set  # CONFIG_DMA_API_DEBUG is not set  # CONFIG_DMA_MAP_BENCHMARK is not set @@ -5888,6 +6005,7 @@ CONFIG_FONT_8x16=y  CONFIG_SG_POOL=y  CONFIG_ARCH_HAS_PMEM_API=y  CONFIG_MEMREGION=y +CONFIG_ARCH_HAS_CPU_CACHE_INVALIDATE_MEMREGION=y  CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y  CONFIG_ARCH_HAS_COPY_MC=y  CONFIG_ARCH_STACKWALK=y @@ -5987,10 +6105,11 @@ CONFIG_DEBUG_WX=y  CONFIG_GENERIC_PTDUMP=y  CONFIG_PTDUMP_CORE=y  # CONFIG_PTDUMP_DEBUGFS is not set -# CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SHRINKER_DEBUG is not set  CONFIG_HAVE_DEBUG_KMEMLEAK=y  # CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_PER_VMA_LOCK_STATS is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SHRINKER_DEBUG is not set  # CONFIG_DEBUG_STACK_USAGE is not set  CONFIG_SCHED_STACK_END_CHECK=y  CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y @@ -6023,14 +6142,20 @@ CONFIG_PANIC_TIMEOUT=0  CONFIG_LOCKUP_DETECTOR=y  CONFIG_SOFTLOCKUP_DETECTOR=y  # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y +CONFIG_HARDLOCKUP_DETECTOR=y +# CONFIG_HARDLOCKUP_DETECTOR_PREFER_BUDDY is not set  CONFIG_HARDLOCKUP_DETECTOR_PERF=y +# CONFIG_HARDLOCKUP_DETECTOR_BUDDY is not set +# CONFIG_HARDLOCKUP_DETECTOR_ARCH is not set +CONFIG_HARDLOCKUP_DETECTOR_COUNTS_HRTIMER=y  CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y -CONFIG_HARDLOCKUP_DETECTOR=y  # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set  CONFIG_DETECT_HUNG_TASK=y  CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120  # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set  # CONFIG_WQ_WATCHDOG is not set +# CONFIG_WQ_CPU_INTENSIVE_REPORT is not set  # CONFIG_TEST_LOCKUP is not set  # end of Debug Oops, Lockups and Hangs @@ -6065,6 +6190,7 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y  # CONFIG_CSD_LOCK_WAIT_DEBUG is not set  # end of Lock Debugging (spinlocks, mutexes, etc...) +# CONFIG_NMI_CHECK_CPU is not set  # CONFIG_DEBUG_IRQFLAGS is not set  CONFIG_STACKTRACE=y  # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set @@ -6077,12 +6203,9 @@ CONFIG_DEBUG_LIST=y  # CONFIG_DEBUG_PLIST is not set  # CONFIG_DEBUG_SG is not set  # CONFIG_DEBUG_NOTIFIERS is not set -CONFIG_BUG_ON_DATA_CORRUPTION=y  # CONFIG_DEBUG_MAPLE_TREE is not set  # end of Debug kernel data structures -# CONFIG_DEBUG_CREDENTIALS is not set -  #  # RCU Debugging  # @@ -6091,6 +6214,7 @@ CONFIG_BUG_ON_DATA_CORRUPTION=y  # CONFIG_RCU_REF_SCALE_TEST is not set  CONFIG_RCU_CPU_STALL_TIMEOUT=21  CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 +# CONFIG_RCU_CPU_STALL_CPUTIME is not set  # CONFIG_RCU_TRACE is not set  # CONFIG_RCU_EQS_DEBUG is not set  # end of RCU Debugging @@ -6111,6 +6235,7 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y  CONFIG_HAVE_SYSCALL_TRACEPOINTS=y  CONFIG_HAVE_FENTRY=y  CONFIG_HAVE_OBJTOOL_MCOUNT=y +CONFIG_HAVE_OBJTOOL_NOP_MCOUNT=y  CONFIG_HAVE_C_RECORDMCOUNT=y  CONFIG_HAVE_BUILDTIME_MCOUNT_SORT=y  CONFIG_TRACE_CLOCK=y @@ -6141,6 +6266,7 @@ CONFIG_BPF_EVENTS=y  CONFIG_DYNAMIC_EVENTS=y  CONFIG_PROBE_EVENTS=y  # CONFIG_SYNTH_EVENTS is not set +# CONFIG_USER_EVENTS is not set  # CONFIG_HIST_TRIGGERS is not set  # CONFIG_TRACE_EVENT_INJECT is not set  # CONFIG_TRACEPOINT_BENCHMARK is not set diff --git a/packages/linux-kernel/build-intel-qat.sh b/packages/linux-kernel/build-intel-qat.sh index 74bbc73b..765cea3f 100755 --- a/packages/linux-kernel/build-intel-qat.sh +++ b/packages/linux-kernel/build-intel-qat.sh @@ -14,14 +14,15 @@ fi  . ${KERNEL_VAR_FILE} -url="https://rolling-packages.vyos.net/source-mirror/QAT1.7.L.4.20.0-00001.tar.gz" +url="https://dev.packages.vyos.net/source-mirror/QAT.L.4.24.0-00005.tar.gz"  cd ${CWD}  DRIVER_FILE=$(basename ${url} | sed -e s/tar_0/tar/)  DRIVER_DIR="${DRIVER_FILE%.tar.gz}"  DRIVER_NAME="QAT" -DRIVER_VERSION=$(echo ${DRIVER_DIR} | awk -F${DRIVER_NAME} '{print $2}') +DRIVER_NAME_EXTRA="L." +DRIVER_VERSION=$(echo ${DRIVER_DIR} | awk -F${DRIVER_NAME} '{print $2}' | awk -F${DRIVER_NAME_EXTRA} '{print $2}')  DRIVER_VERSION_EXTRA="-0"  # Build up Debian related variables required for packaging @@ -107,4 +108,4 @@ if [ -d ${DRIVER_DIR} ]; then  fi  if [ -d ${DEBIAN_DIR} ]; then      rm -rf ${DEBIAN_DIR} -fi
\ No newline at end of file +fi diff --git a/packages/linux-kernel/build-jool.py b/packages/linux-kernel/build-jool.py index 5f26c3b4..1781a6c8 100755 --- a/packages/linux-kernel/build-jool.py +++ b/packages/linux-kernel/build-jool.py @@ -39,7 +39,7 @@ PACKAGE_NAME: str = 'jool'  PACKAGE_VERSION: str = '4.1.9+bf4c7e3669'  PACKAGE_DIR: str = f'{PACKAGE_NAME}-{PACKAGE_VERSION}'  SOURCES_ARCHIVE: str = 'jool-4.1.9+bf4c7e3669.tar.gz' -SOURCES_URL: str = f'https://github.com/NICMx/Jool/archive/bf4c7e3669672367934dc50c8b257b7790f0e27e.tar.gz' +SOURCES_URL: str = f'https://github.com/NICMx/Jool/archive/7f08c42c615ed63cf0fdc1522d91aa0809f6d990.tar.gz'  # download sources  sources_archive = Path(SOURCES_ARCHIVE) diff --git a/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch b/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch index 436cb93b..3a0503eb 100644 --- a/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch +++ b/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch @@ -18,10 +18,10 @@ Backport of earlier Vyatta patch.   8 files changed, 34 insertions(+)  diff --git a/Documentation/networking/ip-sysctl.rst b/Documentation/networking/ip-sysctl.rst -index b47b3d0ce559..a91044bd5afe 100644 +index a66054d0763a..53440098fa98 100644  --- a/Documentation/networking/ip-sysctl.rst  +++ b/Documentation/networking/ip-sysctl.rst -@@ -1609,6 +1609,17 @@ src_valid_mark - BOOLEAN +@@ -1734,6 +1734,17 @@ src_valid_mark - BOOLEAN   	Default value is 0. @@ -52,7 +52,7 @@ index ddb27fc0ee8c..8ee3191d9558 100644   struct in_ifaddr {   	struct hlist_node	hash;  diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h -index 9a44de45cc1f..78f0896ae755 100644 +index af8a771a053c..ece8ac89d317 100644  --- a/include/linux/ipv6.h  +++ b/include/linux/ipv6.h  @@ -84,6 +84,7 @@ struct ipv6_devconf { @@ -76,7 +76,7 @@ index 283dec7e3645..8067941a635e 100644   };  diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h -index 4fa8511b1e35..5eefcb61018b 100644 +index cf592d7b630f..e8915701aa73 100644  --- a/include/uapi/linux/ipv6.h  +++ b/include/uapi/linux/ipv6.h  @@ -199,6 +199,7 @@ enum { @@ -88,10 +88,10 @@ index 4fa8511b1e35..5eefcb61018b 100644   };  diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c -index 35d6e74be840..e67cf474630c 100644 +index ca0ff15dc8fa..67a55fec5b29 100644  --- a/net/ipv4/devinet.c  +++ b/net/ipv4/devinet.c -@@ -2561,6 +2561,7 @@ static struct devinet_sysctl_table { +@@ -2582,6 +2582,7 @@ static struct devinet_sysctl_table {   					      "route_localnet"),   		DEVINET_SYSCTL_FLUSHING_ENTRY(DROP_UNICAST_IN_L2_MULTICAST,   					      "drop_unicast_in_l2_multicast"), @@ -100,10 +100,10 @@ index 35d6e74be840..e67cf474630c 100644   };  diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c -index b8dc20fe7a4e..0d0aec97ba94 100644 +index 0b6ee962c84e..070f2285f9eb 100644  --- a/net/ipv6/addrconf.c  +++ b/net/ipv6/addrconf.c -@@ -5607,6 +5607,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, +@@ -5639,6 +5639,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,   	array[DEVCONF_NDISC_EVICT_NOCARRIER] = cnf->ndisc_evict_nocarrier;   	array[DEVCONF_ACCEPT_UNTRACKED_NA] = cnf->accept_untracked_na;   	array[DEVCONF_ACCEPT_RA_MIN_LFT] = cnf->accept_ra_min_lft; @@ -111,7 +111,7 @@ index b8dc20fe7a4e..0d0aec97ba94 100644   }   static inline size_t inet6_ifla6_size(void) -@@ -7035,6 +7036,13 @@ static const struct ctl_table addrconf_sysctl[] = { +@@ -7071,6 +7072,13 @@ static const struct ctl_table addrconf_sysctl[] = {   		.extra1		= (void *)SYSCTL_ZERO,   		.extra2		= (void *)SYSCTL_ONE,   	}, @@ -126,10 +126,10 @@ index b8dc20fe7a4e..0d0aec97ba94 100644   		.procname	= "ioam6_id",   		.data		= &ipv6_devconf.ioam6_id,  diff --git a/net/ipv6/route.c b/net/ipv6/route.c -index 0bcdb675ba2c..dd770560d941 100644 +index 9c687b357e6a..0be7ebe30a2d 100644  --- a/net/ipv6/route.c  +++ b/net/ipv6/route.c -@@ -678,6 +678,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh) +@@ -676,6 +676,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh)   }   #endif @@ -144,7 +144,7 @@ index 0bcdb675ba2c..dd770560d941 100644   /*    * Default Router Selection (RFC 2461 6.3.6)    */ -@@ -719,6 +727,8 @@ static int rt6_score_route(const struct fib6_nh *nh, u32 fib6_flags, int oif, +@@ -717,6 +725,8 @@ static int rt6_score_route(const struct fib6_nh *nh, u32 fib6_flags, int oif,   	if (!m && (strict & RT6_LOOKUP_F_IFACE))   		return RT6_NUD_FAIL_HARD; diff --git a/packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch b/packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch index fdb8de0a..31544af4 100644 --- a/packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch +++ b/packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch @@ -190,7 +190,7 @@ index 1c4bfdab008d..cf567cc33679 100644   			      struct inotify_inode_mark *i_mark)   {  diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c -index 3d14a3f1465d..adee0c20295a 100644 +index 3fa2416264a4..38930c1e70d8 100644  --- a/fs/overlayfs/super.c  +++ b/fs/overlayfs/super.c  @@ -15,6 +15,7 @@ @@ -199,9 +199,9 @@ index 3d14a3f1465d..adee0c20295a 100644   #include <linux/exportfs.h>  +#include <linux/inotify.h>   #include <linux/file.h> - #include "overlayfs.h" -  -@@ -2202,6 +2203,18 @@ static void ovl_inode_init_once(void *foo) + #include <linux/fs_context.h> + #include <linux/fs_parser.h> +@@ -1525,6 +1526,18 @@ static void ovl_inode_init_once(void *foo)   	inode_init_once(&oi->vfs_inode);   } @@ -220,7 +220,7 @@ index 3d14a3f1465d..adee0c20295a 100644   static int __init ovl_init(void)   {   	int err; -@@ -2217,18 +2230,24 @@ static int __init ovl_init(void) +@@ -1540,18 +1553,24 @@ static int __init ovl_init(void)   	err = ovl_aio_request_cache_init();   	if (!err) {   		err = register_filesystem(&ovl_fs_type); @@ -294,5 +294,5 @@ index 8d20caa1b268..c126e2f93a73 100644  +   #endif	/* _LINUX_INOTIFY_H */  --  -2.30.2 +2.39.2 diff --git a/packages/linux-kernel/patches/kernel/0003-ship-perf-debian-package.patch b/packages/linux-kernel/patches/kernel/0003-ship-perf-debian-package.patch deleted file mode 100644 index 30219961..00000000 --- a/packages/linux-kernel/patches/kernel/0003-ship-perf-debian-package.patch +++ /dev/null @@ -1,92 +0,0 @@ -From: Riku Voipio <riku.voipio@linaro.org> - -Perf is shipped in debian in linux-tools-$version package. Extend -the existing to builddeb script to build perf if BUILD_TOOLS=y -is added the make deb-pkg line - -Some features of this patch I'm uncomfortable with: - -1. Relative paths are resoved to absolute ones -   Especially with separate O= buildd, perf build from tools/perf dir -   fail. - -2. Unsetting LDFLAGS -   make -> shell (builddeb) -> make expands variables. The LDFLAGS as -   set by toplevel makefile are for kernel, so we just unset the flag -   here. - -3. Replaces ubuntu/debian packages instead attempting to fit to -   the linux-base/linux-tools-common frameworks. I think people who -   want to run "make deb-pkg" for their kernels would rather keep this -   simple. - -4. More tools than just perf could be built - unfortunately most -   tools fail to have a working "install" target and/or else have -   build process inconsistent with other tools. A topic for another -   patch series. - -Signed-off-by: Riku Voipio <riku.voipio@linaro.org> - ---- - scripts/package/builddeb | 31 ++++++++++++++++++++++++++++++- - 1 file changed, 30 insertions(+), 1 deletion(-) - -diff --git a/scripts/package/builddeb b/scripts/package/builddeb -index 91a502bb97e8..79987641bed5 100755 ---- a/scripts/package/builddeb -+++ b/scripts/package/builddeb -@@ -109,8 +109,10 @@ deploy_libc_headers () { - version=$KERNELRELEASE - tmpdir=debian/linux-image - dbg_dir=debian/linux-image-dbg -+tools_dir="$objtree/debian/toolstmp" - packagename=linux-image-$version - dbg_packagename=$packagename-dbg -+tools_packagename=linux-tools-$version -  - if [ "$ARCH" = "um" ] ; then - 	packagename=user-mode-linux-$version -@@ -133,7 +135,7 @@ esac - BUILD_DEBUG=$(if_enabled_echo CONFIG_DEBUG_INFO Yes) -  - # Setup the directory structure --rm -rf "$tmpdir" "$dbg_dir" debian/files -+rm -rf "$tmpdir" "$dbg_dir" "$tools_dir" debian/files - mkdir -m 755 -p "$tmpdir/DEBIAN" - mkdir -p "$tmpdir/lib" "$tmpdir/boot" -  -@@ -234,4 +236,31 @@ if [ -n "$BUILD_DEBUG" ] ; then - 	create_package "$dbg_packagename" "$dbg_dir" - fi -  -+if [ -n "$BUILD_TOOLS" ] -+then -+       # HACK - change output dir from relative to absolute -+       mkdir -p $tools_dir -+       tools_dest=`readlink -f $tools_dir` -+       if [ -n "$O" ] -+       then -+               output=`readlink -f $objtree` -+               mkdir -p $output/tools/perf -+               output="O=$output/tools/perf" -+       fi -+       $MAKE -C $srctree/tools/perf $output LDFLAGS= srctree=$KBUILD_SRC prefix=$tools_dest/usr install -+       cat <<EOF >> debian/control -+ -+Package: $tools_packagename -+Architecture: any -+Replaces: linux-base, linux-tools-common -+Depends: \${shlibs:Depends} -+Description: Performance analysis tools for Linux $version -+ This package contains the 'perf' performance analysis tools for Linux -+ kernel version $version . -+EOF -+ -+       dpkg-shlibdeps $tools_dest/usr/bin/* $tools_dest/usr/lib*/traceevent/plugins/* -+       create_package "$tools_packagename" "$tools_dir" -+fi -+ - exit 0 ---  -2.20.1 - | 
