From 8f194d46d2eea937f698bc60cb2db0d3f6312714 Mon Sep 17 00:00:00 2001 From: Xie XiuQi Date: Tue, 25 Apr 2023 20:40:16 +0800 Subject: [PATCH 1/2] update to upstream 6.3 update base to upstream 6.3. update defconfig for 6.3. remove .scmversion from kernel.spec (f6e09b07cc12 "kbuild: do not put .scmversion into the source tarball") Signed-off-by: Xie XiuQi --- ...86-update-defconfig-for-upstream-6.3.patch | 1172 +++++++++++++++++ ...64-update-defconfig-for-upstream-6.3.patch | 1072 +++++++++++++++ SOURCE | 2 +- kernel.spec | 16 +- 4 files changed, 2255 insertions(+), 7 deletions(-) create mode 100644 0006-config-x86-update-defconfig-for-upstream-6.3.patch create mode 100644 0007-config-arm64-update-defconfig-for-upstream-6.3.patch diff --git a/0006-config-x86-update-defconfig-for-upstream-6.3.patch b/0006-config-x86-update-defconfig-for-upstream-6.3.patch new file mode 100644 index 00000000..cefe402d --- /dev/null +++ b/0006-config-x86-update-defconfig-for-upstream-6.3.patch @@ -0,0 +1,1172 @@ +From 8a26d034651d3f53854f11678754bc8a7c131106 Mon Sep 17 00:00:00 2001 +From: Xie XiuQi +Date: Tue, 25 Apr 2023 20:10:45 +0800 +Subject: [PATCH 6/7] config/x86: update defconfig for upstream 6.3 + +Use this cmd to update defconfig: +make update_oedefconfig + +Signed-off-by: Xie XiuQi +--- + arch/x86/configs/openeuler_defconfig | 208 +++++++++++++++++++-------- + 1 file changed, 145 insertions(+), 63 deletions(-) + +diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig +index 8a824f33bc5b..a5ea52c612d2 100644 +--- a/arch/x86/configs/openeuler_defconfig ++++ b/arch/x86/configs/openeuler_defconfig +@@ -1,6 +1,6 @@ + # + # Automatically generated file; DO NOT EDIT. +-# Linux/x86 6.1.0 Kernel Configuration ++# Linux/x86 6.3.0 Kernel Configuration + # + CONFIG_IRQ_WORK=y + CONFIG_BUILDTIME_TABLE_SORT=y +@@ -56,7 +56,6 @@ CONFIG_HARDIRQS_SW_RESEND=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 +@@ -153,6 +152,7 @@ CONFIG_RCU_STALL_COMMON=y + CONFIG_RCU_NEED_SEGCBLIST=y + CONFIG_RCU_NOCB_CPU=y + # CONFIG_RCU_NOCB_CPU_DEFAULT_ALL is not set ++# CONFIG_RCU_LAZY is not set + # end of RCU Subsystem + + CONFIG_IKCONFIG=y +@@ -173,7 +173,7 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y + CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y + CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y + CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +-CONFIG_GCC12_NO_ARRAY_BOUNDS=y ++CONFIG_GCC11_NO_ARRAY_BOUNDS=y + CONFIG_ARCH_SUPPORTS_INT128=y + CONFIG_NUMA_BALANCING=y + CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y +@@ -188,6 +188,7 @@ CONFIG_CGROUP_SCHED=y + CONFIG_FAIR_GROUP_SCHED=y + CONFIG_CFS_BANDWIDTH=y + CONFIG_RT_GROUP_SCHED=y ++CONFIG_SCHED_MM_CID=y + CONFIG_CGROUP_PIDS=y + CONFIG_CGROUP_RDMA=y + CONFIG_CGROUP_FREEZER=y +@@ -222,11 +223,13 @@ CONFIG_RD_LZO=y + CONFIG_RD_LZ4=y + CONFIG_RD_ZSTD=y + CONFIG_BOOT_CONFIG=y ++# CONFIG_BOOT_CONFIG_FORCE is not set + # CONFIG_BOOT_CONFIG_EMBED is not set + 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 +@@ -255,6 +258,7 @@ 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 +@@ -296,7 +300,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 +@@ -447,7 +450,10 @@ CONFIG_X86_INTEL_TSX_MODE_OFF=y + CONFIG_X86_SGX=y + 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 +@@ -483,11 +489,19 @@ CONFIG_HAVE_LIVEPATCH=y + CONFIG_LIVEPATCH=y + # end of Processor type and features + ++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_ARCH_HAS_ADD_PAGES=y +@@ -580,6 +594,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=y + CONFIG_ACPI_PRMT=y + CONFIG_X86_PM_TIMER=y +@@ -677,18 +692,21 @@ CONFIG_HAVE_KVM_IRQ_BYPASS=y + CONFIG_HAVE_KVM_NO_POLL=y + CONFIG_KVM_XFER_TO_GUEST_WORK=y + CONFIG_HAVE_KVM_PM_NOTIFIER=y ++CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y + CONFIG_VIRTUALIZATION=y + CONFIG_KVM=m + CONFIG_KVM_INTEL=m + CONFIG_X86_SGX_KVM=y + CONFIG_KVM_AMD=m + CONFIG_KVM_AMD_SEV=y ++CONFIG_KVM_SMM=y + # CONFIG_KVM_XEN is not set + CONFIG_KVM_EXTERNAL_WRITE_TRACKING=y + CONFIG_AS_AVX512=y + CONFIG_AS_SHA1_NI=y + CONFIG_AS_SHA256_NI=y + CONFIG_AS_TPAUSE=y ++CONFIG_AS_GFNI=y + + # + # General architecture-dependent options +@@ -747,6 +765,7 @@ CONFIG_MMU_GATHER_TABLE_FREE=y + CONFIG_MMU_GATHER_RCU_TABLE_FREE=y + CONFIG_MMU_GATHER_MERGE_VMAS=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 +@@ -837,6 +856,9 @@ 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 +@@ -913,7 +935,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_MQ_RDMA=y +@@ -982,6 +1003,7 @@ CONFIG_ZBUD=y + # CONFIG_Z3FOLD is not set + CONFIG_ZSMALLOC=y + CONFIG_ZSMALLOC_STAT=y ++CONFIG_ZSMALLOC_CHAIN_SIZE=8 + + # + # SLAB allocator options +@@ -1071,7 +1093,6 @@ CONFIG_SECRETMEM=y + 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 + +@@ -1237,6 +1258,7 @@ CONFIG_NF_CONNTRACK_EVENTS=y + CONFIG_NF_CONNTRACK_TIMEOUT=y + CONFIG_NF_CONNTRACK_TIMESTAMP=y + CONFIG_NF_CONNTRACK_LABELS=y ++CONFIG_NF_CONNTRACK_OVS=y + CONFIG_NF_CT_PROTO_DCCP=y + CONFIG_NF_CT_PROTO_GRE=y + CONFIG_NF_CT_PROTO_SCTP=y +@@ -1264,6 +1286,7 @@ CONFIG_NF_NAT_SIP=m + CONFIG_NF_NAT_TFTP=m + CONFIG_NF_NAT_REDIRECT=y + CONFIG_NF_NAT_MASQUERADE=y ++CONFIG_NF_NAT_OVS=y + CONFIG_NETFILTER_SYNPROXY=m + CONFIG_NF_TABLES=m + CONFIG_NF_TABLES_INET=y +@@ -1277,7 +1300,6 @@ CONFIG_NFT_MASQ=m + CONFIG_NFT_REDIR=m + CONFIG_NFT_NAT=m + # CONFIG_NFT_TUNNEL is not set +-CONFIG_NFT_OBJREF=m + CONFIG_NFT_QUEUE=m + CONFIG_NFT_QUOTA=m + CONFIG_NFT_REJECT=m +@@ -1488,7 +1510,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 is not set + CONFIG_IP_NF_TARGET_ECN=m + CONFIG_IP_NF_TARGET_TTL=m + CONFIG_IP_NF_RAW=m +@@ -1618,10 +1639,8 @@ CONFIG_NET_SCHED=y + # + # Queueing/Scheduling + # +-CONFIG_NET_SCH_CBQ=m + CONFIG_NET_SCH_HTB=m + CONFIG_NET_SCH_HFSC=m +-CONFIG_NET_SCH_ATM=m + CONFIG_NET_SCH_PRIO=m + CONFIG_NET_SCH_MULTIQ=m + CONFIG_NET_SCH_RED=m +@@ -1631,9 +1650,9 @@ CONFIG_NET_SCH_TEQL=m + CONFIG_NET_SCH_TBF=m + # CONFIG_NET_SCH_CBS is not set + # CONFIG_NET_SCH_ETF is not set ++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 +@@ -1663,14 +1682,11 @@ CONFIG_DEFAULT_NET_SCH="fq_codel" + # + CONFIG_NET_CLS=y + CONFIG_NET_CLS_BASIC=m +-CONFIG_NET_CLS_TCINDEX=m + CONFIG_NET_CLS_ROUTE4=m + CONFIG_NET_CLS_FW=m + CONFIG_NET_CLS_U32=m + CONFIG_CLS_U32_PERF=y + CONFIG_CLS_U32_MARK=y +-CONFIG_NET_CLS_RSVP=m +-CONFIG_NET_CLS_RSVP6=m + CONFIG_NET_CLS_FLOW=m + CONFIG_NET_CLS_CGROUP=y + CONFIG_NET_CLS_BPF=m +@@ -1772,6 +1788,7 @@ CONFIG_BT_CMTP=m + CONFIG_BT_HIDP=m + CONFIG_BT_HS=y + CONFIG_BT_LE=y ++CONFIG_BT_LE_L2CAP_ECRED=y + # CONFIG_BT_6LOWPAN is not set + # CONFIG_BT_LEDS is not set + # CONFIG_BT_MSFTEXT is not set +@@ -1787,6 +1804,7 @@ CONFIG_BT_BCM=m + CONFIG_BT_RTL=m + CONFIG_BT_HCIBTUSB=m + CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y ++CONFIG_BT_HCIBTUSB_POLL_SYNC=y + CONFIG_BT_HCIBTUSB_BCM=y + # CONFIG_BT_HCIBTUSB_MTK is not set + CONFIG_BT_HCIBTUSB_RTL=y +@@ -1798,6 +1816,7 @@ CONFIG_BT_HCIUART_ATH3K=y + # CONFIG_BT_HCIUART_INTEL is not set + # CONFIG_BT_HCIUART_AG6XX is not set + CONFIG_BT_HCIBCM203X=m ++# CONFIG_BT_HCIBCM4377 is not set + CONFIG_BT_HCIBPA10X=m + CONFIG_BT_HCIBFUSB=m + CONFIG_BT_HCIVHCI=m +@@ -1882,7 +1901,6 @@ CONFIG_PCIE_DPC=y + # CONFIG_PCIE_PTM is not set + # 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 is not set +@@ -2035,12 +2053,9 @@ CONFIG_SYSFB=y + CONFIG_EFI_ESRT=y + CONFIG_EFI_VARS_PSTORE=y + CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y +-CONFIG_EFI_RUNTIME_MAP=y +-# CONFIG_EFI_FAKE_MEMMAP is not set + CONFIG_EFI_SOFT_RESERVE=y + 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 +@@ -2179,7 +2194,6 @@ CONFIG_PARPORT_PC=m + CONFIG_PARPORT_SERIAL=m + # CONFIG_PARPORT_PC_FIFO is not set + # CONFIG_PARPORT_PC_SUPERIO is not set +-# CONFIG_PARPORT_AX88796 is not set + CONFIG_PARPORT_1284=y + CONFIG_PARPORT_NOT_PC=y + CONFIG_PNP=y +@@ -2193,7 +2207,6 @@ CONFIG_BLK_DEV=y + CONFIG_BLK_DEV_NULL_BLK=m + # CONFIG_BLK_DEV_FD is not set + CONFIG_CDROM=m +-# CONFIG_PARIDE is not set + # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set + CONFIG_ZRAM=m + CONFIG_ZRAM_DEF_COMP_LZORLE=y +@@ -2202,6 +2215,7 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y + CONFIG_ZRAM_DEF_COMP="lzo-rle" + CONFIG_ZRAM_WRITEBACK=y + # CONFIG_ZRAM_MEMORY_TRACKING is not set ++# CONFIG_ZRAM_MULTI_COMP is not set + CONFIG_BLK_DEV_LOOP=m + CONFIG_BLK_DEV_LOOP_MIN_COUNT=0 + # CONFIG_BLK_DEV_DRBD is not set +@@ -2312,7 +2326,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=m + CONFIG_PVPANIC=y + # CONFIG_PVPANIC_MMIO is not set +@@ -2526,6 +2539,7 @@ CONFIG_ATA_PIIX=m + # CONFIG_PATA_NS87410 is not set + # CONFIG_PATA_OPTI is not set + # CONFIG_PATA_RZ1000 is not set ++# CONFIG_PATA_PARPORT is not set + + # + # Generic fallback / legacy drivers +@@ -2772,6 +2786,7 @@ CONFIG_ICE_HWTS=y + CONFIG_FM10K=m + # CONFIG_IGC is not set + CONFIG_NET_VENDOR_WANGXUN=y ++CONFIG_LIBWX=m + CONFIG_NGBE=m + CONFIG_TXGBE=m + # CONFIG_JME is not set +@@ -2793,8 +2808,6 @@ 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=y + # CONFIG_MLX5_EN_MACSEC is not set +@@ -2828,6 +2841,7 @@ CONFIG_NET_VENDOR_NETRONOME=y + CONFIG_NFP=m + CONFIG_NFP_APP_FLOWER=y + CONFIG_NFP_APP_ABM_NIC=y ++CONFIG_NFP_NET_IPSEC=y + # CONFIG_NFP_DEBUG is not set + # CONFIG_NET_VENDOR_NVIDIA is not set + CONFIG_NET_VENDOR_OKI=y +@@ -2934,6 +2948,7 @@ CONFIG_MICROSEMI_PHY=m + CONFIG_NATIONAL_PHY=m + # CONFIG_NXP_C45_TJA11XX_PHY is not set + # CONFIG_NXP_TJA11XX_PHY is not set ++# CONFIG_NCN26000_PHY is not set + CONFIG_QSEMI_PHY=m + CONFIG_REALTEK_PHY=m + CONFIG_RENESAS_PHY=m +@@ -3128,6 +3143,7 @@ CONFIG_ATH10K_DEBUGFS=y + # CONFIG_ATH10K_TRACING is not set + # 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 is not set +@@ -3193,6 +3209,7 @@ CONFIG_MT76x2U=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_WILC1000_SPI is not set +@@ -3428,6 +3445,7 @@ CONFIG_INPUT_TOUCHSCREEN=y + # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set + # CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set + # CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set ++# CONFIG_TOUCHSCREEN_CYTTSP5 is not set + # CONFIG_TOUCHSCREEN_DYNAPRO is not set + # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set + # CONFIG_TOUCHSCREEN_EETI is not set +@@ -3437,6 +3455,7 @@ CONFIG_INPUT_TOUCHSCREEN=y + # CONFIG_TOUCHSCREEN_GOODIX is not set + # CONFIG_TOUCHSCREEN_HIDEEP is not set + # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set ++# CONFIG_TOUCHSCREEN_HYNITRON_CSTXXX is not set + # CONFIG_TOUCHSCREEN_ILI210X is not set + # CONFIG_TOUCHSCREEN_ILITEK is not set + # CONFIG_TOUCHSCREEN_S6SY761 is not set +@@ -3483,6 +3502,7 @@ CONFIG_TOUCHSCREEN_WACOM_I2C=m + # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set + # CONFIG_TOUCHSCREEN_IQS5XX is not set + # CONFIG_TOUCHSCREEN_ZINITIX is not set ++# CONFIG_TOUCHSCREEN_HIMAX_HX83112B is not set + CONFIG_INPUT_MISC=y + # CONFIG_INPUT_AD714X is not set + # CONFIG_INPUT_BMA150 is not set +@@ -3566,6 +3586,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 + + # +@@ -3579,12 +3600,14 @@ CONFIG_SERIAL_8250_PNP=y + # CONFIG_SERIAL_8250_FINTEK is not set + 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 +@@ -3688,8 +3711,6 @@ CONFIG_TCG_TIS_ST33ZP24_SPI=m + CONFIG_TELCLOCK=m + # 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 + + # +@@ -3817,6 +3838,7 @@ CONFIG_SPI_MEM=y + # CONFIG_SPI_MICROCHIP_CORE_QSPI is not set + # CONFIG_SPI_LANTIQ_SSC is not set + # CONFIG_SPI_OC_TINY is not set ++# CONFIG_SPI_PCI1XXXX is not set + # CONFIG_SPI_PXA2XX is not set + # CONFIG_SPI_ROCKCHIP is not set + # CONFIG_SPI_SC18IS602 is not set +@@ -3989,6 +4011,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 +@@ -4000,7 +4023,6 @@ CONFIG_POWER_RESET=y + CONFIG_POWER_SUPPLY=y + # CONFIG_POWER_SUPPLY_DEBUG is not set + CONFIG_POWER_SUPPLY_HWMON=y +-# CONFIG_PDA_POWER is not set + # CONFIG_GENERIC_ADC_BATTERY is not set + # CONFIG_IP5XXX_POWER is not set + # CONFIG_TEST_POWER is not set +@@ -4124,6 +4146,7 @@ CONFIG_SENSORS_MAX6639=m + CONFIG_SENSORS_MAX6650=m + CONFIG_SENSORS_MAX6697=m + # CONFIG_SENSORS_MAX31790 is not set ++# CONFIG_SENSORS_MC34VR500 is not set + CONFIG_SENSORS_MCP3021=m + # CONFIG_SENSORS_MLXREG_FAN is not set + # CONFIG_SENSORS_TC654 is not set +@@ -4158,6 +4181,8 @@ CONFIG_SENSORS_NCT6775=m + # CONFIG_SENSORS_NPCM7XX is not set + # 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 +@@ -4190,12 +4215,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 is not set + # CONFIG_SENSORS_TPS53679 is not set + # CONFIG_SENSORS_TPS546D24 is not set +@@ -4271,6 +4298,7 @@ CONFIG_THERMAL_NETLINK=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 +@@ -4286,6 +4314,7 @@ CONFIG_THERMAL_EMULATION=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 is not set +@@ -4332,6 +4361,7 @@ CONFIG_WDAT_WDT=m + # CONFIG_MAX63XX_WATCHDOG is not set + # CONFIG_ACQUIRE_WDT is not set + # CONFIG_ADVANTECH_WDT is not set ++# CONFIG_ADVANTECH_EC_WDT is not set + CONFIG_ALIM1535_WDT=m + CONFIG_ALIM7101_WDT=m + # CONFIG_EBC_C384_WDT is not set +@@ -4398,6 +4428,7 @@ CONFIG_BCMA_DRIVER_GPIO=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 +@@ -4415,8 +4446,6 @@ CONFIG_MFD_CORE=y + # CONFIG_MFD_MC13XXX_SPI 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 +@@ -4446,7 +4475,6 @@ CONFIG_MFD_INTEL_LPSS_PCI=y + CONFIG_MFD_VIPERBOARD=m + # CONFIG_MFD_RETU is not set + # CONFIG_MFD_PCF50633 is not set +-# CONFIG_UCB1400_CORE is not set + # CONFIG_MFD_SY7636A is not set + # CONFIG_MFD_RDC321X is not set + # CONFIG_MFD_RT4831 is not set +@@ -4487,7 +4515,7 @@ CONFIG_MFD_VX855=m + # CONFIG_MFD_WM8350_I2C is not set + # CONFIG_MFD_WM8994 is not set + # CONFIG_MFD_ATC260X_I2C is not set +-# CONFIG_MFD_INTEL_M10_BMC is not set ++# CONFIG_MFD_INTEL_M10_BMC_SPI is not set + # end of Multifunction device drivers + + # CONFIG_REGULATOR is not set +@@ -4765,6 +4793,9 @@ CONFIG_VIDEO_IVTV=m + # CONFIG_VIDEO_IVTV_ALSA is not set + CONFIG_VIDEO_FB_IVTV=m + # CONFIG_VIDEO_FB_IVTV_FORCE_PAT is not set ++# CONFIG_VIDEO_HEXIUM_GEMINI is not set ++# CONFIG_VIDEO_HEXIUM_ORION is not set ++# CONFIG_VIDEO_MXB is not set + + # + # Media capture/analog/hybrid TV support +@@ -4805,6 +4836,7 @@ CONFIG_DVB_PLUTO2=m + CONFIG_DVB_PT1=m + # CONFIG_DVB_PT3 is not set + # CONFIG_DVB_SMIPCIE is not set ++# CONFIG_DVB_BUDGET_CORE is not set + # CONFIG_VIDEO_IPU3_CIO2 is not set + CONFIG_RADIO_ADAPTERS=m + # CONFIG_RADIO_MAXIRADIO is not set +@@ -4869,6 +4901,10 @@ CONFIG_MEDIA_PLATFORM_DRIVERS=y + # Mediatek media platform drivers + # + ++# ++# Microchip Technology, Inc. media platform drivers ++# ++ + # + # NVidia media platform drivers + # +@@ -4934,6 +4970,7 @@ CONFIG_MEDIA_COMMON_OPTIONS=y + # + CONFIG_CYPRESS_FIRMWARE=m + CONFIG_TTPCI_EEPROM=m ++CONFIG_UVC_COMMON=m + CONFIG_VIDEO_CX2341X=m + CONFIG_VIDEO_TVEEPROM=m + CONFIG_DVB_B2C2_FLEXCOP=m +@@ -4973,6 +5010,7 @@ CONFIG_VIDEO_IR_I2C=m + # CONFIG_VIDEO_IMX258 is not set + # CONFIG_VIDEO_IMX274 is not set + # CONFIG_VIDEO_IMX290 is not set ++# CONFIG_VIDEO_IMX296 is not set + # CONFIG_VIDEO_IMX319 is not set + # CONFIG_VIDEO_IMX355 is not set + # CONFIG_VIDEO_MT9M001 is not set +@@ -4988,6 +5026,7 @@ CONFIG_VIDEO_IR_I2C=m + # CONFIG_VIDEO_OG01A1B is not set + # CONFIG_VIDEO_OV02A10 is not set + # CONFIG_VIDEO_OV08D10 is not set ++# CONFIG_VIDEO_OV08X40 is not set + # CONFIG_VIDEO_OV13858 is not set + # CONFIG_VIDEO_OV13B10 is not set + # CONFIG_VIDEO_OV2640 is not set +@@ -4995,6 +5034,7 @@ CONFIG_VIDEO_IR_I2C=m + # CONFIG_VIDEO_OV2680 is not set + # CONFIG_VIDEO_OV2685 is not set + # CONFIG_VIDEO_OV2740 is not set ++# CONFIG_VIDEO_OV4689 is not set + # CONFIG_VIDEO_OV5647 is not set + # CONFIG_VIDEO_OV5648 is not set + # CONFIG_VIDEO_OV5670 is not set +@@ -5008,6 +5048,7 @@ CONFIG_VIDEO_IR_I2C=m + # CONFIG_VIDEO_OV772X is not set + # CONFIG_VIDEO_OV7740 is not set + # CONFIG_VIDEO_OV8856 is not set ++# CONFIG_VIDEO_OV8858 is not set + # CONFIG_VIDEO_OV8865 is not set + # CONFIG_VIDEO_OV9640 is not set + # CONFIG_VIDEO_OV9650 is not set +@@ -5016,7 +5057,6 @@ CONFIG_VIDEO_IR_I2C=m + # CONFIG_VIDEO_RDACM21 is not set + # CONFIG_VIDEO_RJ54N1 is not set + # CONFIG_VIDEO_S5C73M3 is not set +-# CONFIG_VIDEO_S5K4ECGX is not set + # CONFIG_VIDEO_S5K5BAF is not set + # CONFIG_VIDEO_S5K6A3 is not set + # CONFIG_VIDEO_S5K6AA is not set +@@ -5275,12 +5315,12 @@ CONFIG_DVB_CXD2099=m + # Graphics support + # + CONFIG_APERTURE_HELPERS=y ++CONFIG_VIDEO_NOMODESET=y + # CONFIG_AGP is not set + CONFIG_INTEL_GTT=m + CONFIG_VGA_SWITCHEROO=y + CONFIG_DRM=m + CONFIG_DRM_MIPI_DSI=y +-CONFIG_DRM_USE_DYNAMIC_DEBUG=y + CONFIG_DRM_KMS_HELPER=m + CONFIG_DRM_FBDEV_EMULATION=y + CONFIG_DRM_FBDEV_OVERALLOC=100 +@@ -5337,7 +5377,6 @@ CONFIG_DRM_AMD_DC_DCN=y + + # CONFIG_HSA_AMD is not set + CONFIG_DRM_NOUVEAU=m +-# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set + CONFIG_NOUVEAU_DEBUG=5 + CONFIG_NOUVEAU_DEBUG_DEFAULT=3 + # CONFIG_NOUVEAU_DEBUG_MMU is not set +@@ -5348,20 +5387,20 @@ CONFIG_DRM_I915_FORCE_PROBE="" + CONFIG_DRM_I915_CAPTURE_ERROR=y + CONFIG_DRM_I915_COMPRESS_ERROR=y + CONFIG_DRM_I915_USERPTR=y +-CONFIG_DRM_I915_GVT=y + CONFIG_DRM_I915_GVT_KVMGT=m + CONFIG_DRM_I915_REQUEST_TIMEOUT=20000 + CONFIG_DRM_I915_FENCE_TIMEOUT=10000 + CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250 + CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500 + CONFIG_DRM_I915_PREEMPT_TIMEOUT=640 ++CONFIG_DRM_I915_PREEMPT_TIMEOUT_COMPUTE=7500 + CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000 + CONFIG_DRM_I915_STOP_TIMEOUT=100 + CONFIG_DRM_I915_TIMESLICE_DURATION=1 ++CONFIG_DRM_I915_GVT=y + # CONFIG_DRM_VGEM is not set + CONFIG_DRM_VKMS=m + CONFIG_DRM_VMWGFX=m +-CONFIG_DRM_VMWGFX_FBCON=y + # CONFIG_DRM_VMWGFX_MKSSTATS is not set + CONFIG_DRM_GMA500=m + CONFIG_DRM_UDL=m +@@ -5374,6 +5413,8 @@ CONFIG_DRM_PANEL=y + # + # Display Panels + # ++# CONFIG_DRM_PANEL_AUO_A030JTN01 is not set ++# CONFIG_DRM_PANEL_ORISETECH_OTA5601A is not set + # CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set + # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set + # end of Display Panels +@@ -5409,7 +5450,6 @@ CONFIG_DRM_CIRRUS_QEMU=m + # CONFIG_DRM_HYPERV is not set + # CONFIG_DRM_LEGACY is not set + CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y +-CONFIG_DRM_NOMODESET=y + CONFIG_DRM_PRIVACY_SCREEN=y + + # +@@ -5501,6 +5541,7 @@ CONFIG_LCD_PLATFORM=m + # CONFIG_LCD_OTM3225A is not set + CONFIG_BACKLIGHT_CLASS_DEVICE=y + # CONFIG_BACKLIGHT_KTD253 is not set ++# CONFIG_BACKLIGHT_KTZ8866 is not set + # CONFIG_BACKLIGHT_PWM is not set + CONFIG_BACKLIGHT_APPLE=m + # CONFIG_BACKLIGHT_QCOM_WLED is not set +@@ -5538,6 +5579,7 @@ CONFIG_LOGO=y + CONFIG_LOGO_LINUX_CLUT224=y + # end of Graphics support + ++# CONFIG_DRM_ACCEL is not set + CONFIG_SOUND=m + CONFIG_SOUND_OSS_CORE=y + CONFIG_SOUND_OSS_CORE_PRECLAIM=y +@@ -5695,6 +5737,7 @@ CONFIG_SND_HDA_CODEC_SI3054=m + CONFIG_SND_HDA_GENERIC=m + CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 + # CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set ++# CONFIG_SND_HDA_CTL_DEV_ID is not set + # end of HD-Audio + + CONFIG_SND_HDA_CORE=m +@@ -5855,6 +5898,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m + # CONFIG_SND_SOC_AK5558 is not set + # CONFIG_SND_SOC_ALC5623 is not set + # CONFIG_SND_SOC_AW8738 is not set ++# CONFIG_SND_SOC_AW88395 is not set + # CONFIG_SND_SOC_BD28623 is not set + # CONFIG_SND_SOC_BT_SCO is not set + # CONFIG_SND_SOC_CS35L32 is not set +@@ -5894,8 +5938,10 @@ CONFIG_SND_SOC_ES8316=m + # CONFIG_SND_SOC_ES8328_SPI is not set + # CONFIG_SND_SOC_GTM601 is not set + CONFIG_SND_SOC_HDAC_HDMI=m ++CONFIG_SND_SOC_HDAC_HDA=m + # CONFIG_SND_SOC_HDA is not set + # CONFIG_SND_SOC_ICS43432 is not set ++# CONFIG_SND_SOC_IDT821034 is not set + # CONFIG_SND_SOC_INNO_RK3036 is not set + # CONFIG_SND_SOC_MAX98088 is not set + CONFIG_SND_SOC_MAX98090=m +@@ -5922,6 +5968,7 @@ CONFIG_SND_SOC_MAX98390=m + # CONFIG_SND_SOC_PCM5102A is not set + # CONFIG_SND_SOC_PCM512x_I2C is not set + # CONFIG_SND_SOC_PCM512x_SPI is not set ++# CONFIG_SND_SOC_PEB2466 is not set + # CONFIG_SND_SOC_RK3328 is not set + CONFIG_SND_SOC_RL6231=m + CONFIG_SND_SOC_RL6347A=m +@@ -5941,6 +5988,7 @@ CONFIG_SND_SOC_RT5670=m + # CONFIG_SND_SOC_SGTL5000 is not set + # CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set + # CONFIG_SND_SOC_SIMPLE_MUX is not set ++# CONFIG_SND_SOC_SMA1303 is not set + # CONFIG_SND_SOC_SPDIF is not set + # CONFIG_SND_SOC_SRC4XXX_I2C is not set + # CONFIG_SND_SOC_SSM2305 is not set +@@ -5998,6 +6046,7 @@ CONFIG_SND_SOC_TS3A227E=m + # CONFIG_SND_SOC_WM8904 is not set + # CONFIG_SND_SOC_WM8940 is not set + # CONFIG_SND_SOC_WM8960 is not set ++# CONFIG_SND_SOC_WM8961 is not set + # CONFIG_SND_SOC_WM8962 is not set + # CONFIG_SND_SOC_WM8974 is not set + # CONFIG_SND_SOC_WM8978 is not set +@@ -6028,10 +6077,7 @@ CONFIG_SND_SYNTH_EMUX=m + CONFIG_SND_XEN_FRONTEND=m + # CONFIG_SND_VIRTIO is not set + CONFIG_AC97_BUS=m +- +-# +-# HID support +-# ++CONFIG_HID_SUPPORT=y + CONFIG_HID=y + CONFIG_HID_BATTERY_STRENGTH=y + CONFIG_HIDRAW=y +@@ -6068,6 +6114,7 @@ CONFIG_HID_DRAGONRISE=m + CONFIG_HID_ELAN=m + CONFIG_HID_ELECOM=m + CONFIG_HID_ELO=m ++# CONFIG_HID_EVISION is not set + CONFIG_HID_EZKEY=m + # CONFIG_HID_FT260 is not set + CONFIG_HID_GEMBIRD=m +@@ -6165,6 +6212,12 @@ CONFIG_HID_ALPS=m + # CONFIG_HID_MCP2221 is not set + # end of Special HID drivers + ++# ++# HID-BPF support ++# ++# CONFIG_HID_BPF is not set ++# end of HID-BPF support ++ + # + # USB HID support + # +@@ -6173,11 +6226,8 @@ CONFIG_HID_PID=y + CONFIG_USB_HIDDEV=y + # end of USB HID support + +-# +-# I2C HID support +-# ++CONFIG_I2C_HID=y + # CONFIG_I2C_HID_ACPI is not set +-# end of I2C HID support + + # + # Intel ISH HID support +@@ -6191,7 +6241,6 @@ CONFIG_INTEL_ISH_HID=m + # + # 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 +@@ -6233,7 +6282,6 @@ CONFIG_USB_EHCI_PCI=y + # 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_MAX3421_HCD is not set + CONFIG_USB_OHCI_HCD=y + CONFIG_USB_OHCI_HCD_PCI=y +@@ -6285,6 +6333,10 @@ CONFIG_USB_UAS=m + CONFIG_USB_MDC800=m + CONFIG_USB_MICROTEK=m + # 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 +@@ -6418,6 +6470,7 @@ CONFIG_TYPEC_TPS6598X=m + # USB Type-C Multiplexer/DeMultiplexer Switch support + # + # CONFIG_TYPEC_MUX_FSA4480 is not set ++# CONFIG_TYPEC_MUX_GPIO_SBU is not set + CONFIG_TYPEC_MUX_PI3USB30532=m + # end of USB Type-C Multiplexer/DeMultiplexer Switch support + +@@ -6613,7 +6666,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 +@@ -6720,7 +6772,6 @@ CONFIG_RTC_DRV_M48T59=m + CONFIG_RTC_DRV_MSM6242=m + CONFIG_RTC_DRV_BQ4802=m + CONFIG_RTC_DRV_RP5C01=m +-CONFIG_RTC_DRV_V3020=m + + # + # on-CPU RTC drivers +@@ -6750,6 +6801,7 @@ CONFIG_INTEL_IDXD_SVM=y + CONFIG_INTEL_IDXD_PERFMON=y + CONFIG_INTEL_IOATDMA=m + # CONFIG_PLX_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 +@@ -6757,7 +6809,6 @@ CONFIG_DW_DMAC_CORE=y + CONFIG_DW_DMAC=m + CONFIG_DW_DMAC_PCI=y + # 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 +@@ -6797,9 +6848,10 @@ CONFIG_UIO_PCI_GENERIC=m + # CONFIG_UIO_MF624 is not set + CONFIG_UIO_HV_GENERIC=m + CONFIG_VFIO=m ++CONFIG_VFIO_CONTAINER=y + CONFIG_VFIO_IOMMU_TYPE1=m +-CONFIG_VFIO_VIRQFD=m + CONFIG_VFIO_NOIOMMU=y ++CONFIG_VFIO_VIRQFD=y + CONFIG_VFIO_PCI_CORE=m + CONFIG_VFIO_PCI_MMAP=y + CONFIG_VFIO_PCI_INTX=y +@@ -6913,9 +6965,8 @@ CONFIG_AMILO_RFKILL=m + CONFIG_FUJITSU_LAPTOP=m + CONFIG_FUJITSU_TABLET=m + # CONFIG_GPD_POCKET_FAN is not set +-CONFIG_HP_ACCEL=m ++# CONFIG_X86_PLATFORM_DRIVERS_HP is not set + # CONFIG_WIRELESS_HOTKEY is not set +-CONFIG_HP_WMI=m + # CONFIG_IBM_RTL is not set + CONFIG_IDEAPAD_LAPTOP=m + CONFIG_SENSORS_HDAPS=m +@@ -6928,6 +6979,7 @@ CONFIG_THINKPAD_ACPI_VIDEO=y + CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y + # CONFIG_THINKPAD_LMI 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_PMC_CORE=m + +@@ -7033,6 +7085,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 +@@ -7086,6 +7140,8 @@ CONFIG_HYPERV_IOMMU=y + # + # end of Enable LiteX SoC Builder specific drivers + ++# CONFIG_WPCM450_SOC is not set ++ + # + # Qualcomm SoC drivers + # +@@ -7146,6 +7202,8 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 + # CONFIG_FXLS8962AF_SPI is not set + CONFIG_HID_SENSOR_ACCEL_3D=m + # CONFIG_IIO_ST_ACCEL_3AXIS is not set ++# CONFIG_IIO_KX022A_SPI is not set ++# CONFIG_IIO_KX022A_I2C is not set + # CONFIG_KXSD9 is not set + # CONFIG_KXCJK1013 is not set + # CONFIG_MC3230 is not set +@@ -7167,6 +7225,7 @@ CONFIG_HID_SENSOR_ACCEL_3D=m + # + # Analog to digital converters + # ++# CONFIG_AD4130 is not set + # CONFIG_AD7091R5 is not set + # CONFIG_AD7124 is not set + # CONFIG_AD7192 is not set +@@ -7199,6 +7258,7 @@ CONFIG_HID_SENSOR_ACCEL_3D=m + # CONFIG_MAX11100 is not set + # CONFIG_MAX1118 is not set + # CONFIG_MAX11205 is not set ++# CONFIG_MAX11410 is not set + # CONFIG_MAX1241 is not set + # CONFIG_MAX1363 is not set + # CONFIG_MAX9611 is not set +@@ -7216,11 +7276,13 @@ CONFIG_HID_SENSOR_ACCEL_3D=m + # CONFIG_TI_ADC128S052 is not set + # CONFIG_TI_ADC161S626 is not set + # CONFIG_TI_ADS1015 is not set ++# CONFIG_TI_ADS7924 is not set + # CONFIG_TI_ADS7950 is not set + # CONFIG_TI_ADS8344 is not set + # CONFIG_TI_ADS8688 is not set + # CONFIG_TI_ADS124S08 is not set + # CONFIG_TI_ADS131E08 is not set ++# CONFIG_TI_LMP92064 is not set + # CONFIG_TI_TLC4541 is not set + # CONFIG_TI_TSC2046 is not set + # CONFIG_VF610_ADC is not set +@@ -7231,6 +7293,7 @@ CONFIG_HID_SENSOR_ACCEL_3D=m + # + # Analog to digital and digital to analog converters + # ++# CONFIG_AD74115 is not set + # CONFIG_AD74413R is not set + # end of Analog to digital and digital to analog converters + +@@ -7323,6 +7386,7 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m + # CONFIG_LTC2632 is not set + # CONFIG_M62332 is not set + # CONFIG_MAX517 is not set ++# CONFIG_MAX5522 is not set + # CONFIG_MAX5821 is not set + # CONFIG_MCP4725 is not set + # CONFIG_MCP4922 is not set +@@ -7359,6 +7423,7 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m + # + # CONFIG_ADF4350 is not set + # CONFIG_ADF4371 is not set ++# CONFIG_ADF4377 is not set + # CONFIG_ADMV1013 is not set + # CONFIG_ADMV1014 is not set + # CONFIG_ADMV4420 is not set +@@ -7503,6 +7568,7 @@ CONFIG_HID_SENSOR_MAGNETOMETER_3D=m + # CONFIG_SENSORS_HMC5843_SPI is not set + # CONFIG_SENSORS_RM3100_I2C is not set + # CONFIG_SENSORS_RM3100_SPI is not set ++# CONFIG_TI_TMAG5273 is not set + # CONFIG_YAMAHA_YAS530 is not set + # end of Magnetometer sensors + +@@ -7619,6 +7685,7 @@ CONFIG_HID_SENSOR_TEMP=m + # CONFIG_TMP117 is not set + # CONFIG_TSYS01 is not set + # CONFIG_TSYS02D is not set ++# CONFIG_MAX30208 is not set + # CONFIG_MAX31856 is not set + # CONFIG_MAX31865 is not set + # end of Temperature sensors +@@ -7674,7 +7741,7 @@ CONFIG_PWM_LPSS_PLATFORM=m + CONFIG_POWERCAP=y + CONFIG_INTEL_RAPL_CORE=m + CONFIG_INTEL_RAPL=m +-# CONFIG_IDLE_INJECT is not set ++CONFIG_IDLE_INJECT=y + # CONFIG_MCB is not set + + # +@@ -7703,6 +7770,7 @@ CONFIG_ND_PFN=m + CONFIG_NVDIMM_PFN=y + CONFIG_NVDIMM_DAX=y + CONFIG_NVDIMM_KEYS=y ++# CONFIG_NVDIMM_SECURITY_TEST is not set + CONFIG_DAX=y + CONFIG_DEV_DAX=m + CONFIG_DEV_DAX_PMEM=m +@@ -7743,6 +7811,7 @@ CONFIG_INTEL_TH_PTI=m + CONFIG_DCACHE_WORD_ACCESS=y + # CONFIG_VALIDATE_FS_PARSER is not set + CONFIG_FS_IOMAP=y ++CONFIG_LEGACY_DIRECT_IO=y + # CONFIG_EXT2_FS is not set + CONFIG_EXT3_FS=m + # CONFIG_EXT3_FS_POSIX_ACL is not set +@@ -7902,9 +7971,11 @@ CONFIG_CRAMFS_BLOCKDEV=y + CONFIG_SQUASHFS=m + # CONFIG_SQUASHFS_FILE_CACHE is not set + CONFIG_SQUASHFS_FILE_DIRECT=y +-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set +-# CONFIG_SQUASHFS_DECOMP_MULTI is not set +-CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y ++CONFIG_SQUASHFS_DECOMP_SINGLE=y ++# 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 is not set +@@ -7962,7 +8033,7 @@ CONFIG_NFS_DEBUG=y + # CONFIG_NFS_DISABLE_UDP_SUPPORT is not set + # CONFIG_NFS_V4_2_READ_PLUS is not set + CONFIG_NFSD=m +-CONFIG_NFSD_V2_ACL=y ++# CONFIG_NFSD_V2 is not set + CONFIG_NFSD_V3_ACL=y + CONFIG_NFSD_V4=y + CONFIG_NFSD_PNFS=y +@@ -7981,7 +8052,11 @@ CONFIG_SUNRPC=m + CONFIG_SUNRPC_GSS=m + CONFIG_SUNRPC_BACKCHANNEL=y + CONFIG_RPCSEC_GSS_KRB5=m +-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set ++CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM=y ++# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set ++CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y ++# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set ++# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set + CONFIG_SUNRPC_DEBUG=y + CONFIG_SUNRPC_XPRT_RDMA=m + CONFIG_CEPH_FS=m +@@ -8212,7 +8287,6 @@ CONFIG_CRYPTO_MANAGER2=y + CONFIG_CRYPTO_USER=m + # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set + # CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set +-CONFIG_CRYPTO_GF128MUL=y + CONFIG_CRYPTO_NULL=y + CONFIG_CRYPTO_NULL2=y + CONFIG_CRYPTO_PCRYPT=m +@@ -8385,6 +8459,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 is not set + # CONFIG_CRYPTO_NHPOLY1305_SSE2 is not set +@@ -8481,6 +8557,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_LIB_BLAKE2S_GENERIC=y + CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m + CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m +@@ -8566,7 +8643,6 @@ CONFIG_DMA_COHERENT_POOL=y + CONFIG_SGL_ALLOC=y + CONFIG_CHECK_SIGNATURE=y + CONFIG_CPUMASK_OFFSTACK=y +-# CONFIG_FORCE_NR_CPUS is not set + CONFIG_CPU_RMAP=y + CONFIG_DQL=y + CONFIG_GLOB=y +@@ -8589,6 +8665,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 +@@ -8633,7 +8710,8 @@ CONFIG_DEBUG_INFO=y + CONFIG_DEBUG_INFO_DWARF4=y + # CONFIG_DEBUG_INFO_DWARF5 is not set + # CONFIG_DEBUG_INFO_REDUCED is not set +-# CONFIG_DEBUG_INFO_COMPRESSED is not set ++CONFIG_DEBUG_INFO_COMPRESSED_NONE=y ++# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set + # CONFIG_DEBUG_INFO_SPLIT is not set + CONFIG_DEBUG_INFO_BTF=y + # CONFIG_GDB_SCRIPTS is not set +@@ -8699,10 +8777,10 @@ CONFIG_ARCH_HAS_DEBUG_WX=y + # CONFIG_DEBUG_WX is not set + CONFIG_GENERIC_PTDUMP=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_DEBUG_OBJECTS is not set ++# CONFIG_SHRINKER_DEBUG is not set + # CONFIG_DEBUG_STACK_USAGE is not set + # CONFIG_SCHED_STACK_END_CHECK is not set + CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y +@@ -8773,6 +8851,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 +@@ -8799,6 +8878,7 @@ CONFIG_DEBUG_LIST=y + # CONFIG_RCU_REF_SCALE_TEST is not set + CONFIG_RCU_CPU_STALL_TIMEOUT=60 + 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 +@@ -8806,6 +8886,7 @@ CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 + # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set + # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set + # CONFIG_LATENCYTOP is not set ++# CONFIG_DEBUG_CGROUP_REF is not set + CONFIG_USER_STACKTRACE_SUPPORT=y + CONFIG_NOP_TRACER=y + CONFIG_HAVE_RETHOOK=y +@@ -8821,6 +8902,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_BUILDTIME_MCOUNT_SORT=y +-- +2.25.1 + diff --git a/0007-config-arm64-update-defconfig-for-upstream-6.3.patch b/0007-config-arm64-update-defconfig-for-upstream-6.3.patch new file mode 100644 index 00000000..e49ab19d --- /dev/null +++ b/0007-config-arm64-update-defconfig-for-upstream-6.3.patch @@ -0,0 +1,1072 @@ +From 3820cfb2a8f5e8ad3fd843f0869802004e510320 Mon Sep 17 00:00:00 2001 +From: Xie XiuQi +Date: Tue, 25 Apr 2023 20:31:22 +0800 +Subject: [PATCH 7/7] config/arm64: update defconfig for upstream 6.3 + +Use this cmd to update defconfig: +make update_oedefconfig + +Signed-off-by: Xie XiuQi +--- + arch/arm64/configs/openeuler_defconfig | 203 +++++++++++++++++-------- + 1 file changed, 136 insertions(+), 67 deletions(-) + +diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig +index 63f2adbbc778..3b1ba0606051 100644 +--- a/arch/arm64/configs/openeuler_defconfig ++++ b/arch/arm64/configs/openeuler_defconfig +@@ -1,6 +1,6 @@ + # + # Automatically generated file; DO NOT EDIT. +-# Linux/arm64 6.1.0 Kernel Configuration ++# Linux/arm64 6.3.0 Kernel Configuration + # + CONFIG_IRQ_WORK=y + CONFIG_BUILDTIME_TABLE_SORT=y +@@ -44,7 +44,6 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y + CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y + CONFIG_GENERIC_IRQ_IPI=y + CONFIG_GENERIC_MSI_IRQ=y +-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y + CONFIG_IRQ_MSI_IOMMU=y + CONFIG_IRQ_FORCED_THREADING=y + CONFIG_SPARSE_IRQ=y +@@ -131,6 +130,7 @@ CONFIG_RCU_STALL_COMMON=y + CONFIG_RCU_NEED_SEGCBLIST=y + CONFIG_RCU_NOCB_CPU=y + # CONFIG_RCU_NOCB_CPU_DEFAULT_ALL is not set ++# CONFIG_RCU_LAZY is not set + # end of RCU Subsystem + + CONFIG_IKCONFIG=y +@@ -150,7 +150,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y + + CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y + CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +-CONFIG_GCC12_NO_ARRAY_BOUNDS=y ++CONFIG_GCC11_NO_ARRAY_BOUNDS=y + CONFIG_ARCH_SUPPORTS_INT128=y + CONFIG_NUMA_BALANCING=y + CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y +@@ -165,6 +165,7 @@ CONFIG_CGROUP_SCHED=y + CONFIG_FAIR_GROUP_SCHED=y + CONFIG_CFS_BANDWIDTH=y + CONFIG_RT_GROUP_SCHED=y ++CONFIG_SCHED_MM_CID=y + CONFIG_CGROUP_PIDS=y + CONFIG_CGROUP_RDMA=y + CONFIG_CGROUP_FREEZER=y +@@ -199,11 +200,13 @@ CONFIG_RD_LZO=y + CONFIG_RD_LZ4=y + CONFIG_RD_ZSTD=y + CONFIG_BOOT_CONFIG=y ++# CONFIG_BOOT_CONFIG_FORCE is not set + # CONFIG_BOOT_CONFIG_EMBED is not set + 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 +@@ -230,6 +233,7 @@ 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_BASE_RELATIVE=y + CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +@@ -255,7 +259,7 @@ CONFIG_TRACEPOINTS=y + # end of General setup + + CONFIG_ARM64=y +-CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_REGS=y ++CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y + CONFIG_64BIT=y + CONFIG_MMU=y + CONFIG_ARM64_PAGE_SHIFT=12 +@@ -366,6 +370,7 @@ CONFIG_ARM64_ERRATUM_2441009=y + CONFIG_ARM64_ERRATUM_2064142=y + CONFIG_ARM64_ERRATUM_2038923=y + CONFIG_ARM64_ERRATUM_1902691=y ++CONFIG_ARM64_ERRATUM_2645198=y + CONFIG_CAVIUM_ERRATUM_22375=y + CONFIG_CAVIUM_ERRATUM_23144=y + CONFIG_CAVIUM_ERRATUM_23154=y +@@ -486,7 +491,6 @@ CONFIG_RANDOMIZE_BASE=y + CONFIG_RANDOMIZE_MODULE_REGION_FULL=y + CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y + CONFIG_STACKPROTECTOR_PER_TASK=y +-CONFIG_ARCH_NR_GPIO=0 + # end of Kernel Features + + # +@@ -590,6 +594,7 @@ CONFIG_ACPI_GENERIC_GSI=y + CONFIG_ACPI_CCA_REQUIRED=y + # CONFIG_ACPI_DEBUGGER is not set + CONFIG_ACPI_SPCR_TABLE=y ++# CONFIG_ACPI_FPDT is not set + # CONFIG_ACPI_EC_DEBUGFS is not set + CONFIG_ACPI_AC=y + CONFIG_ACPI_BATTERY=y +@@ -632,8 +637,10 @@ CONFIG_ACPI_APEI_EINJ=m + CONFIG_ACPI_IORT=y + CONFIG_ACPI_GTDT=y + # CONFIG_ACPI_AGDI is not set ++CONFIG_ACPI_APMT=y + CONFIG_ACPI_PPTT=y + CONFIG_ACPI_PCC=y ++# CONFIG_ACPI_FFH is not set + # CONFIG_PMIC_OPREGION is not set + CONFIG_ACPI_PRMT=y + CONFIG_IRQ_BYPASS_MANAGER=y +@@ -641,6 +648,9 @@ CONFIG_HAVE_KVM=y + CONFIG_HAVE_KVM_IRQCHIP=y + CONFIG_HAVE_KVM_IRQFD=y + CONFIG_HAVE_KVM_IRQ_ROUTING=y ++CONFIG_HAVE_KVM_DIRTY_RING=y ++CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y ++CONFIG_NEED_KVM_DIRTY_RING_WITH_BITMAP=y + CONFIG_HAVE_KVM_EVENTFD=y + CONFIG_KVM_MMIO=y + CONFIG_HAVE_KVM_MSI=y +@@ -651,6 +661,7 @@ 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_KVM_GENERIC_HARDWARE_ENABLING=y + CONFIG_VIRTUALIZATION=y + CONFIG_KVM=y + # CONFIG_NVHE_EL2_DEBUG is not set +@@ -697,6 +708,7 @@ CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y + CONFIG_MMU_GATHER_TABLE_FREE=y + CONFIG_MMU_GATHER_RCU_TABLE_FREE=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 +@@ -768,6 +780,11 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y + # end of GCOV-based kernel profiling + + CONFIG_HAVE_GCC_PLUGINS=y ++CONFIG_GCC_PLUGINS=y ++# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set ++CONFIG_FUNCTION_ALIGNMENT_4B=y ++CONFIG_FUNCTION_ALIGNMENT_8B=y ++CONFIG_FUNCTION_ALIGNMENT=8 + # end of General architecture-dependent options + + CONFIG_RT_MUTEXES=y +@@ -845,7 +862,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_MQ_RDMA=y +@@ -967,13 +983,15 @@ CONFIG_ZBUD=y + # CONFIG_Z3FOLD is not set + CONFIG_ZSMALLOC=y + CONFIG_ZSMALLOC_STAT=y ++CONFIG_ZSMALLOC_CHAIN_SIZE=8 + + # + # SLAB allocator options + # + # CONFIG_SLAB is not set + CONFIG_SLUB=y +-# CONFIG_SLOB is not set ++# CONFIG_SLOB_DEPRECATED is not set ++# CONFIG_SLUB_TINY is not set + CONFIG_SLAB_MERGE_DEFAULT=y + CONFIG_SLAB_FREELIST_RANDOM=y + # CONFIG_SLAB_FREELIST_HARDENED is not set +@@ -1215,6 +1233,7 @@ CONFIG_NF_CONNTRACK_EVENTS=y + CONFIG_NF_CONNTRACK_TIMEOUT=y + CONFIG_NF_CONNTRACK_TIMESTAMP=y + CONFIG_NF_CONNTRACK_LABELS=y ++CONFIG_NF_CONNTRACK_OVS=y + CONFIG_NF_CT_PROTO_DCCP=y + CONFIG_NF_CT_PROTO_GRE=y + CONFIG_NF_CT_PROTO_SCTP=y +@@ -1242,6 +1261,7 @@ CONFIG_NF_NAT_SIP=m + CONFIG_NF_NAT_TFTP=m + CONFIG_NF_NAT_REDIRECT=y + CONFIG_NF_NAT_MASQUERADE=y ++CONFIG_NF_NAT_OVS=y + CONFIG_NETFILTER_SYNPROXY=m + CONFIG_NF_TABLES=m + CONFIG_NF_TABLES_INET=y +@@ -1255,7 +1275,6 @@ CONFIG_NFT_MASQ=m + CONFIG_NFT_REDIR=m + CONFIG_NFT_NAT=m + # CONFIG_NFT_TUNNEL is not set +-CONFIG_NFT_OBJREF=m + CONFIG_NFT_QUEUE=m + CONFIG_NFT_QUOTA=m + CONFIG_NFT_REJECT=m +@@ -1466,7 +1485,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 is not set + CONFIG_IP_NF_TARGET_ECN=m + CONFIG_IP_NF_TARGET_TTL=m + CONFIG_IP_NF_RAW=m +@@ -1596,10 +1614,8 @@ CONFIG_NET_SCHED=y + # + # Queueing/Scheduling + # +-CONFIG_NET_SCH_CBQ=m + CONFIG_NET_SCH_HTB=m + CONFIG_NET_SCH_HFSC=m +-CONFIG_NET_SCH_ATM=m + CONFIG_NET_SCH_PRIO=m + CONFIG_NET_SCH_MULTIQ=m + CONFIG_NET_SCH_RED=m +@@ -1609,9 +1625,9 @@ CONFIG_NET_SCH_TEQL=m + CONFIG_NET_SCH_TBF=m + # CONFIG_NET_SCH_CBS is not set + # CONFIG_NET_SCH_ETF is not set ++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 +@@ -1641,14 +1657,11 @@ CONFIG_DEFAULT_NET_SCH="fq_codel" + # + CONFIG_NET_CLS=y + CONFIG_NET_CLS_BASIC=m +-CONFIG_NET_CLS_TCINDEX=m + CONFIG_NET_CLS_ROUTE4=m + CONFIG_NET_CLS_FW=m + CONFIG_NET_CLS_U32=m + CONFIG_CLS_U32_PERF=y + CONFIG_CLS_U32_MARK=y +-CONFIG_NET_CLS_RSVP=m +-CONFIG_NET_CLS_RSVP6=m + CONFIG_NET_CLS_FLOW=m + CONFIG_NET_CLS_CGROUP=y + CONFIG_NET_CLS_BPF=m +@@ -1819,7 +1832,6 @@ CONFIG_PCIE_DPC=y + # CONFIG_PCIE_PTM is not set + CONFIG_PCIE_EDR=y + 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 is not set +@@ -1998,7 +2010,6 @@ CONFIG_EFI_RUNTIME_WRAPPERS=y + CONFIG_EFI_GENERIC_STUB=y + # CONFIG_EFI_ZBOOT is not set + CONFIG_EFI_ARMSTUB_DTB_LOADER=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 +@@ -2190,6 +2201,7 @@ CONFIG_ZRAM_DEF_COMP_LZORLE=y + CONFIG_ZRAM_DEF_COMP="lzo-rle" + # CONFIG_ZRAM_WRITEBACK is not set + # CONFIG_ZRAM_MEMORY_TRACKING is not set ++# CONFIG_ZRAM_MULTI_COMP is not set + CONFIG_BLK_DEV_LOOP=m + CONFIG_BLK_DEV_LOOP_MIN_COUNT=0 + CONFIG_BLK_DEV_DRBD=m +@@ -2292,7 +2304,6 @@ CONFIG_ALTERA_STAPL=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=m + # CONFIG_PVPANIC is not set + # CONFIG_GP_PCI1XXXX is not set +@@ -2741,6 +2752,7 @@ CONFIG_ICE_SWITCHDEV=y + CONFIG_FM10K=m + # CONFIG_IGC is not set + CONFIG_NET_VENDOR_WANGXUN=y ++CONFIG_LIBWX=m + CONFIG_NGBE=m + CONFIG_TXGBE=m + # CONFIG_JME is not set +@@ -2763,8 +2775,6 @@ 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=y + # CONFIG_MLX5_EN_MACSEC is not set +@@ -2796,6 +2806,7 @@ CONFIG_NET_VENDOR_NETRONOME=y + CONFIG_NFP=m + CONFIG_NFP_APP_FLOWER=y + CONFIG_NFP_APP_ABM_NIC=y ++CONFIG_NFP_NET_IPSEC=y + # CONFIG_NFP_DEBUG is not set + # CONFIG_NET_VENDOR_NVIDIA is not set + CONFIG_NET_VENDOR_OKI=y +@@ -2905,6 +2916,7 @@ CONFIG_MICROCHIP_PHY=m + CONFIG_NATIONAL_PHY=m + # 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 +@@ -3091,12 +3103,12 @@ CONFIG_ATH10K_PCI=m + # CONFIG_ATH10K_AHB is not set + # CONFIG_ATH10K_SDIO is not set + # CONFIG_ATH10K_USB is not set +-# CONFIG_ATH10K_SNOC is not set + # CONFIG_ATH10K_DEBUG is not set + # CONFIG_ATH10K_DEBUGFS is not set + # CONFIG_ATH10K_TRACING is not set + # 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 is not set + # CONFIG_WLAN_VENDOR_CISCO is not set +@@ -3334,6 +3346,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 + + # +@@ -3347,12 +3360,14 @@ CONFIG_SERIAL_8250_16550A_VARIANTS=y + # CONFIG_SERIAL_8250_FINTEK is not set + 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 +@@ -3369,7 +3384,7 @@ CONFIG_SERIAL_OF_PLATFORM=y + # CONFIG_SERIAL_AMBA_PL010 is not set + CONFIG_SERIAL_AMBA_PL011=y + CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +-CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y ++# CONFIG_SERIAL_EARLYCON_SEMIHOST is not set + # CONFIG_SERIAL_KGDB_NMI is not set + # CONFIG_SERIAL_MAX3100 is not set + # CONFIG_SERIAL_MAX310X is not set +@@ -3417,6 +3432,7 @@ CONFIG_IPMI_SSIF=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=y + CONFIG_HW_RANDOM_TIMERIOMEM=m +@@ -3452,8 +3468,6 @@ CONFIG_TCG_TIS_ST33ZP24_I2C=m + CONFIG_TCG_TIS_ST33ZP24_SPI=m + # 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 + + # +@@ -3600,6 +3614,7 @@ CONFIG_SPI_HISI_SFC_V3XX=m + # CONFIG_SPI_MICROCHIP_CORE is not set + # CONFIG_SPI_MICROCHIP_CORE_QSPI is not set + # CONFIG_SPI_OC_TINY is not set ++# CONFIG_SPI_PCI1XXXX is not set + CONFIG_SPI_PL022=m + # CONFIG_SPI_PXA2XX is not set + # CONFIG_SPI_ROCKCHIP is not set +@@ -3607,6 +3622,7 @@ CONFIG_SPI_PL022=m + CONFIG_SPI_QUP=y + # CONFIG_SPI_SC18IS602 is not set + # CONFIG_SPI_SIFIVE is not set ++# CONFIG_SPI_SN_F_OSPI is not set + # CONFIG_SPI_MXIC is not set + # CONFIG_SPI_THUNDERX is not set + # CONFIG_SPI_XCOMM is not set +@@ -3671,6 +3687,7 @@ CONFIG_GENERIC_PINCONF=y + # CONFIG_PINCTRL_STMFX is not set + # CONFIG_PINCTRL_SX150X is not set + CONFIG_PINCTRL_MSM=y ++# CONFIG_PINCTRL_IPQ5332 is not set + # CONFIG_PINCTRL_IPQ8074 is not set + # CONFIG_PINCTRL_IPQ6018 is not set + # CONFIG_PINCTRL_MDM9607 is not set +@@ -3684,11 +3701,14 @@ CONFIG_PINCTRL_MSM=y + # CONFIG_PINCTRL_QCS404 is not set + CONFIG_PINCTRL_QDF2XXX=y + # CONFIG_PINCTRL_QCOM_SSBI_PMIC is not set ++# CONFIG_PINCTRL_QDU1000 is not set ++# CONFIG_PINCTRL_SA8775P is not set + # CONFIG_PINCTRL_SC7180 is not set + # CONFIG_PINCTRL_SC7280 is not set + # CONFIG_PINCTRL_SC8180X is not set + # CONFIG_PINCTRL_SC8280XP is not set + # CONFIG_PINCTRL_SDM660 is not set ++# CONFIG_PINCTRL_SDM670 is not set + # CONFIG_PINCTRL_SDM845 is not set + # CONFIG_PINCTRL_SM6115 is not set + # CONFIG_PINCTRL_SM6125 is not set +@@ -3698,6 +3718,7 @@ CONFIG_PINCTRL_QDF2XXX=y + # CONFIG_PINCTRL_SM8250 is not set + # CONFIG_PINCTRL_SM8350 is not set + # CONFIG_PINCTRL_SM8450 is not set ++# CONFIG_PINCTRL_SM8550 is not set + # CONFIG_PINCTRL_LPASS_LPI is not set + + # +@@ -3790,6 +3811,7 @@ CONFIG_GPIO_XLP=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 +@@ -3814,7 +3836,6 @@ CONFIG_POWER_RESET_SYSCON=y + 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 +@@ -3850,6 +3871,8 @@ CONFIG_CHARGER_SMB347=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_UCS1002 is not set + # CONFIG_CHARGER_BD99954 is not set + # CONFIG_BATTERY_UG3105 is not set +@@ -3931,6 +3954,7 @@ 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 is not set + # CONFIG_SENSORS_TPS23861 is not set +@@ -3998,12 +4022,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 is not set + # CONFIG_SENSORS_TPS546D24 is not set +@@ -4159,6 +4185,7 @@ CONFIG_BCMA_DRIVER_GPIO=y + CONFIG_MFD_CORE=m + # CONFIG_MFD_ACT8945A is not set + # CONFIG_MFD_AS3711 is not set ++# CONFIG_MFD_SMPRO is not set + # CONFIG_MFD_AS3722 is not set + # CONFIG_PMIC_ADP5520 is not set + # CONFIG_MFD_AAT2870_CORE is not set +@@ -4182,8 +4209,6 @@ CONFIG_MFD_CORE=m + # CONFIG_MFD_MP2629 is not set + # CONFIG_MFD_HI6421_PMIC is not set + # CONFIG_MFD_HI655X_PMIC is not set +-# CONFIG_HTC_PASIC3 is not set +-# CONFIG_HTC_I2CPLD is not set + # CONFIG_LPC_ICH is not set + # CONFIG_LPC_SCH is not set + # CONFIG_MFD_IQS62X is not set +@@ -4243,6 +4268,7 @@ CONFIG_MFD_SYSCON=y + # CONFIG_MFD_TI_LP873X is not set + # CONFIG_MFD_TI_LP87565 is not set + # CONFIG_MFD_TPS65218 is not set ++# CONFIG_MFD_TPS65219 is not set + # CONFIG_MFD_TPS6586X is not set + # CONFIG_MFD_TPS65910 is not set + # CONFIG_MFD_TPS65912_I2C is not set +@@ -4270,7 +4296,7 @@ CONFIG_MFD_SYSCON=y + # CONFIG_MFD_ATC260X_I2C is not set + # CONFIG_MFD_QCOM_PM8008 is not set + # CONFIG_MFD_VEXPRESS_SYSREG is not set +-# CONFIG_MFD_INTEL_M10_BMC is not set ++# CONFIG_MFD_INTEL_M10_BMC_SPI is not set + # CONFIG_MFD_RSMU_I2C is not set + # CONFIG_MFD_RSMU_SPI is not set + # end of Multifunction device drivers +@@ -4304,6 +4330,7 @@ CONFIG_REGULATOR=y + # CONFIG_REGULATOR_MAX8952 is not set + # CONFIG_REGULATOR_MAX8973 is not set + # CONFIG_REGULATOR_MAX20086 is not set ++# CONFIG_REGULATOR_MAX20411 is not set + # CONFIG_REGULATOR_MAX77826 is not set + # CONFIG_REGULATOR_MCP16502 is not set + # CONFIG_REGULATOR_MP5416 is not set +@@ -4323,6 +4350,7 @@ CONFIG_REGULATOR=y + # CONFIG_REGULATOR_RT5190A 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 +@@ -4515,6 +4543,10 @@ CONFIG_MEDIA_PLATFORM_DRIVERS=y + # Mediatek media platform drivers + # + ++# ++# Microchip Technology, Inc. media platform drivers ++# ++ + # + # NVidia media platform drivers + # +@@ -4569,6 +4601,7 @@ CONFIG_MEDIA_PLATFORM_DRIVERS=y + # CONFIG_SMS_SDIO_DRV is not set + # CONFIG_V4L_TEST_DRIVERS is not set + # CONFIG_DVB_TEST_DRIVERS is not set ++CONFIG_UVC_COMMON=m + CONFIG_VIDEOBUF2_CORE=m + CONFIG_VIDEOBUF2_V4L2=m + CONFIG_VIDEOBUF2_MEMOPS=m +@@ -4593,11 +4626,13 @@ CONFIG_MEDIA_ATTACH=y + # CONFIG_VIDEO_IMX258 is not set + # CONFIG_VIDEO_IMX274 is not set + # CONFIG_VIDEO_IMX290 is not set ++# CONFIG_VIDEO_IMX296 is not set + # CONFIG_VIDEO_IMX319 is not set + # CONFIG_VIDEO_IMX334 is not set + # CONFIG_VIDEO_IMX335 is not set + # CONFIG_VIDEO_IMX355 is not set + # CONFIG_VIDEO_IMX412 is not set ++# CONFIG_VIDEO_IMX415 is not set + # CONFIG_VIDEO_MT9M001 is not set + # CONFIG_VIDEO_MT9M032 is not set + # CONFIG_VIDEO_MT9M111 is not set +@@ -4611,6 +4646,7 @@ CONFIG_MEDIA_ATTACH=y + # CONFIG_VIDEO_OG01A1B is not set + # CONFIG_VIDEO_OV02A10 is not set + # CONFIG_VIDEO_OV08D10 is not set ++# CONFIG_VIDEO_OV08X40 is not set + # CONFIG_VIDEO_OV13858 is not set + # CONFIG_VIDEO_OV13B10 is not set + # CONFIG_VIDEO_OV2640 is not set +@@ -4618,6 +4654,7 @@ CONFIG_MEDIA_ATTACH=y + # CONFIG_VIDEO_OV2680 is not set + # CONFIG_VIDEO_OV2685 is not set + # CONFIG_VIDEO_OV2740 is not set ++# CONFIG_VIDEO_OV4689 is not set + # CONFIG_VIDEO_OV5640 is not set + # CONFIG_VIDEO_OV5645 is not set + # CONFIG_VIDEO_OV5647 is not set +@@ -4633,6 +4670,7 @@ CONFIG_MEDIA_ATTACH=y + # CONFIG_VIDEO_OV772X is not set + # CONFIG_VIDEO_OV7740 is not set + # CONFIG_VIDEO_OV8856 is not set ++# CONFIG_VIDEO_OV8858 is not set + # CONFIG_VIDEO_OV8865 is not set + # CONFIG_VIDEO_OV9282 is not set + # CONFIG_VIDEO_OV9640 is not set +@@ -4642,11 +4680,11 @@ CONFIG_MEDIA_ATTACH=y + # CONFIG_VIDEO_RDACM21 is not set + # CONFIG_VIDEO_RJ54N1 is not set + # CONFIG_VIDEO_S5C73M3 is not set +-# CONFIG_VIDEO_S5K4ECGX is not set + # CONFIG_VIDEO_S5K5BAF is not set + # CONFIG_VIDEO_S5K6A3 is not set + # CONFIG_VIDEO_S5K6AA is not set + # CONFIG_VIDEO_SR030PC30 is not set ++# CONFIG_VIDEO_ST_VGXY61 is not set + # CONFIG_VIDEO_VS6624 is not set + # CONFIG_VIDEO_CCS is not set + # CONFIG_VIDEO_ET8EK8 is not set +@@ -4715,6 +4753,7 @@ CONFIG_MEDIA_ATTACH=y + # CONFIG_VIDEO_SAA7110 is not set + # CONFIG_VIDEO_SAA711X is not set + # CONFIG_VIDEO_TC358743 is not set ++# CONFIG_VIDEO_TC358746 is not set + # CONFIG_VIDEO_TVP514X is not set + # CONFIG_VIDEO_TVP5150 is not set + # CONFIG_VIDEO_TVP7002 is not set +@@ -4998,9 +5037,9 @@ CONFIG_DVB_SP2=m + # Graphics support + # + CONFIG_APERTURE_HELPERS=y ++CONFIG_VIDEO_NOMODESET=y + CONFIG_DRM=y + # CONFIG_DRM_DEBUG_MM is not set +-CONFIG_DRM_USE_DYNAMIC_DEBUG=y + CONFIG_DRM_KMS_HELPER=m + # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set + # CONFIG_DRM_DEBUG_MODESET_LOCK is not set +@@ -5010,6 +5049,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=100 + CONFIG_DRM_LOAD_EDID_FIRMWARE=y + CONFIG_DRM_DISPLAY_HELPER=m + CONFIG_DRM_DISPLAY_DP_HELPER=y ++CONFIG_DRM_DISPLAY_HDCP_HELPER=y + CONFIG_DRM_DISPLAY_HDMI_HELPER=y + CONFIG_DRM_DP_AUX_CHARDEV=y + # CONFIG_DRM_DP_CEC is not set +@@ -5054,13 +5094,14 @@ CONFIG_DRM_AMDGPU_USERPTR=y + # Display Engine Configuration + # + CONFIG_DRM_AMD_DC=y ++CONFIG_DRM_AMD_DC_DCN=y + # CONFIG_DRM_AMD_DC_HDCP is not set + # CONFIG_DEBUG_KERNEL_DC is not set ++# CONFIG_DRM_AMD_SECURE_DISPLAY is not set + # end of Display Engine Configuration + + # CONFIG_HSA_AMD is not set + CONFIG_DRM_NOUVEAU=m +-# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set + CONFIG_NOUVEAU_DEBUG=5 + CONFIG_NOUVEAU_DEBUG_DEFAULT=3 + # CONFIG_NOUVEAU_DEBUG_MMU is not set +@@ -5072,9 +5113,6 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y + CONFIG_DRM_UDL=m + CONFIG_DRM_AST=m + CONFIG_DRM_MGAG200=m +-# CONFIG_DRM_RCAR_DW_HDMI is not set +-# CONFIG_DRM_RCAR_USE_LVDS is not set +-# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set + CONFIG_DRM_QXL=m + CONFIG_DRM_VIRTIO_GPU=m + # CONFIG_DRM_MSM is not set +@@ -5085,6 +5123,7 @@ CONFIG_DRM_PANEL=y + # + # CONFIG_DRM_PANEL_ABT_Y030XX067A is not set + # CONFIG_DRM_PANEL_ARM_VERSATILE is not set ++# CONFIG_DRM_PANEL_AUO_A030JTN01 is not set + # CONFIG_DRM_PANEL_LVDS is not set + # CONFIG_DRM_PANEL_SIMPLE is not set + # CONFIG_DRM_PANEL_EDP is not set +@@ -5098,6 +5137,7 @@ CONFIG_DRM_PANEL=y + # CONFIG_DRM_PANEL_NEWVISION_NV3052C is not set + # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set + # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set ++# CONFIG_DRM_PANEL_ORISETECH_OTA5601A is not set + # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set + # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set + # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set +@@ -5120,7 +5160,6 @@ CONFIG_DRM_PANEL_BRIDGE=y + # + # Display Interface Bridges + # +-# CONFIG_DRM_CDNS_DSI is not set + # CONFIG_DRM_CHIPONE_ICN6211 is not set + # CONFIG_DRM_CHRONTEL_CH7033 is not set + # CONFIG_DRM_DISPLAY_CONNECTOR is not set +@@ -5155,6 +5194,7 @@ CONFIG_DRM_PANEL_BRIDGE=y + # CONFIG_DRM_ANALOGIX_ANX78XX is not set + # CONFIG_DRM_ANALOGIX_ANX7625 is not set + # CONFIG_DRM_I2C_ADV7511 is not set ++# CONFIG_DRM_CDNS_DSI is not set + # CONFIG_DRM_CDNS_MHDP8546 is not set + # end of Display Interface Bridges + +@@ -5162,8 +5202,6 @@ CONFIG_DRM_PANEL_BRIDGE=y + CONFIG_DRM_HISI_HIBMC=m + # CONFIG_DRM_HISI_KIRIN is not set + # CONFIG_DRM_LOGICVC is not set +-# CONFIG_DRM_MXSFB is not set +-# CONFIG_DRM_IMX_LCDIF is not set + # CONFIG_DRM_ARCPGU is not set + CONFIG_DRM_BOCHS=m + CONFIG_DRM_CIRRUS_QEMU=m +@@ -5187,7 +5225,6 @@ CONFIG_DRM_CIRRUS_QEMU=m + # CONFIG_DRM_SSD130X is not set + # CONFIG_DRM_LEGACY is not set + CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y +-CONFIG_DRM_NOMODESET=y + + # + # Frame buffer Devices +@@ -5270,6 +5307,7 @@ CONFIG_LCD_PLATFORM=m + # CONFIG_LCD_OTM3225A is not set + CONFIG_BACKLIGHT_CLASS_DEVICE=y + # CONFIG_BACKLIGHT_KTD253 is not set ++# CONFIG_BACKLIGHT_KTZ8866 is not set + CONFIG_BACKLIGHT_PWM=m + # CONFIG_BACKLIGHT_QCOM_WLED is not set + # CONFIG_BACKLIGHT_ADP8860 is not set +@@ -5305,12 +5343,10 @@ CONFIG_LOGO=y + CONFIG_LOGO_LINUX_CLUT224=y + # end of Graphics support + ++# CONFIG_DRM_ACCEL is not set + CONFIG_SOUND=m + # CONFIG_SND is not set +- +-# +-# HID support +-# ++CONFIG_HID_SUPPORT=y + CONFIG_HID=y + CONFIG_HID_BATTERY_STRENGTH=y + CONFIG_HIDRAW=y +@@ -5346,6 +5382,7 @@ CONFIG_HID_DRAGONRISE=m + # CONFIG_HID_ELAN is not set + CONFIG_HID_ELECOM=m + CONFIG_HID_ELO=m ++# CONFIG_HID_EVISION is not set + CONFIG_HID_EZKEY=y + # CONFIG_HID_FT260 is not set + CONFIG_HID_GEMBIRD=m +@@ -5441,6 +5478,11 @@ CONFIG_HID_SENSOR_HUB=m + # CONFIG_HID_MCP2221 is not set + # end of Special HID drivers + ++# ++# HID-BPF support ++# ++# end of HID-BPF support ++ + # + # USB HID support + # +@@ -5449,16 +5491,11 @@ CONFIG_HID_PID=y + CONFIG_USB_HIDDEV=y + # end of USB HID support + +-# +-# I2C HID support +-# ++CONFIG_I2C_HID=y + # CONFIG_I2C_HID_ACPI is not set + # CONFIG_I2C_HID_OF is not set + # CONFIG_I2C_HID_OF_ELAN is not set + # CONFIG_I2C_HID_OF_GOODIX is not set +-# end of I2C HID support +-# end of HID support +- + CONFIG_USB_OHCI_LITTLE_ENDIAN=y + CONFIG_USB_SUPPORT=y + CONFIG_USB_COMMON=y +@@ -5501,7 +5538,6 @@ CONFIG_USB_EHCI_PCI=y + CONFIG_USB_EHCI_HCD_PLATFORM=y + # CONFIG_USB_OXU210HP_HCD is not set + # CONFIG_USB_ISP116X_HCD is not set +-# CONFIG_USB_FOTG210_HCD is not set + # CONFIG_USB_MAX3421_HCD is not set + CONFIG_USB_OHCI_HCD=y + CONFIG_USB_OHCI_HCD_PCI=y +@@ -5552,6 +5588,10 @@ CONFIG_USB_UAS=m + CONFIG_USB_MDC800=m + CONFIG_USB_MICROTEK=m + # 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 +@@ -5687,6 +5727,7 @@ CONFIG_UCSI_ACPI=m + # USB Type-C Multiplexer/DeMultiplexer Switch support + # + # CONFIG_TYPEC_MUX_FSA4480 is not set ++# CONFIG_TYPEC_MUX_GPIO_SBU is not set + # CONFIG_TYPEC_MUX_PI3USB30532 is not set + # end of USB Type-C Multiplexer/DeMultiplexer Switch support + +@@ -6006,7 +6047,6 @@ CONFIG_RTC_DRV_M48T59=m + CONFIG_RTC_DRV_MSM6242=m + CONFIG_RTC_DRV_BQ4802=m + CONFIG_RTC_DRV_RP5C01=m +-CONFIG_RTC_DRV_V3020=m + # CONFIG_RTC_DRV_ZYNQMP is not set + + # +@@ -6046,6 +6086,7 @@ CONFIG_DMA_OF=y + # CONFIG_PLX_DMA is not set + # CONFIG_XGENE_DMA is not set + # CONFIG_XILINX_DMA is not set ++# CONFIG_XILINX_XDMA is not set + # CONFIG_XILINX_ZYNQMP_DMA is not set + # CONFIG_XILINX_ZYNQMP_DPDMA is not set + # CONFIG_QCOM_BAM_DMA is not set +@@ -6056,7 +6097,6 @@ CONFIG_DW_DMAC_CORE=m + CONFIG_DW_DMAC=m + CONFIG_DW_DMAC_PCI=m + # CONFIG_DW_EDMA is not set +-# CONFIG_DW_EDMA_PCIE is not set + # CONFIG_SF_PDMA is not set + + # +@@ -6097,9 +6137,10 @@ CONFIG_UIO_PCI_GENERIC=m + # CONFIG_UIO_PRUSS is not set + # CONFIG_UIO_MF624 is not set + CONFIG_VFIO=m ++CONFIG_VFIO_CONTAINER=y + CONFIG_VFIO_IOMMU_TYPE1=m +-CONFIG_VFIO_VIRQFD=m + CONFIG_VFIO_NOIOMMU=y ++CONFIG_VFIO_VIRQFD=y + CONFIG_VFIO_PCI_CORE=m + CONFIG_VFIO_PCI_MMAP=y + CONFIG_VFIO_PCI_INTX=y +@@ -6110,7 +6151,6 @@ CONFIG_VFIO_PLATFORM=m + # CONFIG_VFIO_AMBA is not set + # CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET is not set + # CONFIG_VFIO_PLATFORM_AMDXGBE_RESET is not set +-CONFIG_VFIO_MDEV=m + # CONFIG_VIRT_DRIVERS is not set + CONFIG_VIRTIO_ANCHOR=y + CONFIG_VIRTIO=m +@@ -6150,6 +6190,7 @@ CONFIG_CHROME_PLATFORMS=y + # CONFIG_CHROMEOS_TBMC is not set + # CONFIG_CROS_EC is not set + # CONFIG_CROS_KBD_LED_BACKLIGHT is not set ++# CONFIG_CROS_HPS_I2C is not set + # CONFIG_CHROMEOS_PRIVACY_SCREEN is not set + # CONFIG_MELLANOX_PLATFORM is not set + CONFIG_SURFACE_PLATFORMS=y +@@ -6216,7 +6257,6 @@ CONFIG_FSL_ERRATUM_A008585=y + CONFIG_HISILICON_ERRATUM_161010101=y + CONFIG_ARM64_ERRATUM_858921=y + CONFIG_ARM_TIMER_SP804=y +-# CONFIG_MICROCHIP_PIT64B is not set + # end of Clock Source drivers + + CONFIG_MAILBOX=y +@@ -6254,6 +6294,7 @@ CONFIG_IOMMU_DEFAULT_DMA_STRICT=y + CONFIG_OF_IOMMU=y + CONFIG_IOMMU_DMA=y + CONFIG_IOMMU_SVA=y ++# CONFIG_IOMMUFD is not set + CONFIG_ARM_SMMU=y + # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set + CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y +@@ -6318,6 +6359,8 @@ CONFIG_ARM_SMMU_V3_SVA=y + # CONFIG_LITEX_SOC_CONTROLLER is not set + # end of Enable LiteX SoC Builder specific drivers + ++# CONFIG_WPCM450_SOC is not set ++ + # + # Qualcomm SoC drivers + # +@@ -6329,6 +6372,7 @@ CONFIG_ARM_SMMU_V3_SVA=y + # CONFIG_QCOM_LLCC is not set + CONFIG_QCOM_KRYO_L2_ACCESSORS=y + # CONFIG_QCOM_OCMEM is not set ++# CONFIG_QCOM_RAMP_CTRL is not set + # CONFIG_QCOM_RMTFS_MEM is not set + # CONFIG_QCOM_RPMH is not set + # CONFIG_QCOM_SMEM is not set +@@ -6438,6 +6482,8 @@ CONFIG_PHY_HI6220_USB=m + # CONFIG_PHY_QCOM_PCIE2 is not set + # CONFIG_PHY_QCOM_QMP is not set + # CONFIG_PHY_QCOM_QUSB2 is not set ++# CONFIG_PHY_QCOM_SNPS_EUSB2 is not set ++# CONFIG_PHY_QCOM_EUSB2_REPEATER is not set + # CONFIG_PHY_QCOM_USB_HS is not set + # CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set + # CONFIG_PHY_QCOM_USB_HSIC is not set +@@ -6472,6 +6518,7 @@ CONFIG_HISI_PMU=m + CONFIG_HISI_PCIE_PMU=m + CONFIG_HNS3_PMU=m + # CONFIG_MARVELL_CN10K_DDR_PMU is not set ++# CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set + # end of Performance monitor support + + CONFIG_RAS=y +@@ -6492,6 +6539,7 @@ CONFIG_ND_BTT=m + CONFIG_BTT=y + CONFIG_OF_PMEM=m + CONFIG_NVDIMM_KEYS=y ++# CONFIG_NVDIMM_SECURITY_TEST is not set + CONFIG_DAX=y + CONFIG_DEV_DAX=m + CONFIG_DEV_DAX_HMEM=m +@@ -6530,6 +6578,7 @@ CONFIG_TEE=m + CONFIG_DCACHE_WORD_ACCESS=y + # CONFIG_VALIDATE_FS_PARSER is not set + CONFIG_FS_IOMAP=y ++CONFIG_LEGACY_DIRECT_IO=y + # CONFIG_EXT2_FS is not set + CONFIG_EXT3_FS=m + # CONFIG_EXT3_FS_POSIX_ACL is not set +@@ -6661,9 +6710,6 @@ CONFIG_TMPFS_XATTR=y + CONFIG_ARCH_SUPPORTS_HUGETLBFS=y + 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=y +@@ -6689,8 +6735,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 +@@ -6748,7 +6796,7 @@ CONFIG_NFS_DEBUG=y + # CONFIG_NFS_DISABLE_UDP_SUPPORT is not set + # CONFIG_NFS_V4_2_READ_PLUS is not set + CONFIG_NFSD=m +-CONFIG_NFSD_V2_ACL=y ++# CONFIG_NFSD_V2 is not set + CONFIG_NFSD_V3_ACL=y + CONFIG_NFSD_V4=y + CONFIG_NFSD_PNFS=y +@@ -6767,7 +6815,11 @@ CONFIG_SUNRPC=m + CONFIG_SUNRPC_GSS=m + CONFIG_SUNRPC_BACKCHANNEL=y + CONFIG_RPCSEC_GSS_KRB5=m +-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set ++CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM=y ++# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set ++CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y ++# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set ++# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set + CONFIG_SUNRPC_DEBUG=y + CONFIG_SUNRPC_XPRT_RDMA=m + CONFIG_CEPH_FS=m +@@ -6956,11 +7008,17 @@ CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,appar + # Memory initialization + # + CONFIG_INIT_STACK_NONE=y ++# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set ++# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set ++# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set ++# CONFIG_GCC_PLUGIN_STACKLEAK is not set + # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set + # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set + # end of Memory initialization + + CONFIG_RANDSTRUCT_NONE=y ++# CONFIG_RANDSTRUCT_FULL is not set ++# CONFIG_RANDSTRUCT_PERFORMANCE is not set + # end of Kernel hardening options + # end of Security options + +@@ -6999,7 +7057,6 @@ CONFIG_CRYPTO_MANAGER2=y + CONFIG_CRYPTO_USER=m + # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set + # CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set +-CONFIG_CRYPTO_GF128MUL=y + CONFIG_CRYPTO_NULL=y + CONFIG_CRYPTO_NULL2=y + CONFIG_CRYPTO_PCRYPT=m +@@ -7165,6 +7222,7 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=m + CONFIG_CRYPTO_SHA512_ARM64=m + CONFIG_CRYPTO_SHA512_ARM64_CE=m + CONFIG_CRYPTO_SHA3_ARM64=m ++# CONFIG_CRYPTO_SM3_NEON is not set + CONFIG_CRYPTO_SM3_ARM64_CE=m + # CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set + CONFIG_CRYPTO_AES_ARM64=y +@@ -7176,6 +7234,8 @@ CONFIG_CRYPTO_SM4_ARM64_CE=m + CONFIG_CRYPTO_SM4_ARM64_CE_BLK=m + CONFIG_CRYPTO_SM4_ARM64_NEON_BLK=m + CONFIG_CRYPTO_AES_ARM64_CE_CCM=m ++# CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set ++# CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set + CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m + # end of Accelerated Cryptographic Algorithms for CPU (arm64) + +@@ -7268,6 +7328,7 @@ CONFIG_INDIRECT_PIO=y + CONFIG_CRYPTO_LIB_UTILS=y + CONFIG_CRYPTO_LIB_AES=y + CONFIG_CRYPTO_LIB_ARC4=m ++CONFIG_CRYPTO_LIB_GF128MUL=y + CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y + CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m + CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m +@@ -7447,7 +7508,8 @@ CONFIG_DEBUG_INFO=y + CONFIG_DEBUG_INFO_DWARF4=y + # CONFIG_DEBUG_INFO_DWARF5 is not set + # CONFIG_DEBUG_INFO_REDUCED is not set +-# CONFIG_DEBUG_INFO_COMPRESSED is not set ++CONFIG_DEBUG_INFO_COMPRESSED_NONE=y ++# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set + # CONFIG_DEBUG_INFO_SPLIT is not set + CONFIG_DEBUG_INFO_BTF=y + # CONFIG_GDB_SCRIPTS is not set +@@ -7514,10 +7576,10 @@ CONFIG_ARCH_HAS_DEBUG_WX=y + # CONFIG_DEBUG_WX is not set + CONFIG_GENERIC_PTDUMP=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_DEBUG_OBJECTS is not set ++# CONFIG_SHRINKER_DEBUG is not set + # CONFIG_DEBUG_STACK_USAGE is not set + # CONFIG_SCHED_STACK_END_CHECK is not set + CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y +@@ -7609,6 +7671,7 @@ CONFIG_DEBUG_LIST=y + # CONFIG_RCU_REF_SCALE_TEST is not set + CONFIG_RCU_CPU_STALL_TIMEOUT=60 + 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 +@@ -7616,11 +7679,13 @@ CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 + # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set + # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set + # CONFIG_LATENCYTOP is not set ++# CONFIG_DEBUG_CGROUP_REF is not set + CONFIG_NOP_TRACER=y + CONFIG_HAVE_FUNCTION_TRACER=y + CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y + CONFIG_HAVE_DYNAMIC_FTRACE=y +-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y ++CONFIG_HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS=y ++CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y + CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y + CONFIG_HAVE_SYSCALL_TRACEPOINTS=y + CONFIG_HAVE_C_RECORDMCOUNT=y +@@ -7637,7 +7702,8 @@ CONFIG_BOOTTIME_TRACING=y + CONFIG_FUNCTION_TRACER=y + CONFIG_FUNCTION_GRAPH_TRACER=y + CONFIG_DYNAMIC_FTRACE=y +-CONFIG_DYNAMIC_FTRACE_WITH_REGS=y ++CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS=y ++CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y + CONFIG_FUNCTION_PROFILER=y + CONFIG_STACK_TRACER=y + # CONFIG_IRQSOFF_TRACER is not set +@@ -7698,6 +7764,9 @@ CONFIG_ETM4X_IMPDEF_FEATURE=y + # CONFIG_CORESIGHT_CPU_DEBUG is not set + # CONFIG_CORESIGHT_CTI is not set + CONFIG_CORESIGHT_TRBE=m ++# CONFIG_ULTRASOC_SMB is not set ++# CONFIG_CORESIGHT_TPDM is not set ++# CONFIG_CORESIGHT_TPDA is not set + # end of arm64 Debugging + + # +-- +2.25.1 + diff --git a/SOURCE b/SOURCE index fe5479e6..a6d25b8c 100644 --- a/SOURCE +++ b/SOURCE @@ -1 +1 @@ -v6.1.8 +v6.3 diff --git a/kernel.spec b/kernel.spec index 85784162..ed9acb6a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -8,11 +8,11 @@ %global KernelVer %{version}-%{release}.%{_target_cpu} %global debuginfodir /usr/lib/debug -%global upstream_version 6.1 -%global upstream_sublevel 8 +%global upstream_version 6.3 +%global upstream_sublevel 0 %global devel_release 3 %global maintenance_release .0.0 -%global pkg_release .7 +%global pkg_release .8 %define with_debuginfo 0 # Do not recompute the build-id of vmlinux in find-debuginfo.sh @@ -75,6 +75,8 @@ Patch0002: 0002-config-add-initial-openeuler_defconfig-for-arm64.patch Patch0003: 0003-config-add-initial-openeuler_defconfig-for-x86_64.patch Patch0004: 0004-config-disable-CONFIG_EFI_ZBOOT-by-default.patch Patch0005: 0005-arm64-vmalloc-use-module-region-only-for-module_allo.patch +Patch0006: 0006-config-x86-update-defconfig-for-upstream-6.3.patch +Patch0007: 0007-config-arm64-update-defconfig-for-upstream-6.3.patch #BuildRequires: BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, tar @@ -304,7 +306,8 @@ Applypatches series.conf %{_builddir}/kernel-%{version}/linux-%{KernelVer} %patch0003 -p1 %patch0004 -p1 %patch0005 -p1 -touch .scmversion +%patch0006 -p1 +%patch0007 -p1 find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null find . -name .gitignore -exec rm -f {} \; >/dev/null @@ -435,7 +438,6 @@ popd mkdir -p $RPM_BUILD_ROOT/usr/src/ mv linux-%{KernelVer}-source $RPM_BUILD_ROOT/usr/src/linux-%{KernelVer} cp linux-%{KernelVer}/.config $RPM_BUILD_ROOT/usr/src/linux-%{KernelVer}/ - cp linux-%{KernelVer}/.scmversion $RPM_BUILD_ROOT/usr/src/linux-%{KernelVer}/ %endif cd linux-%{KernelVer} @@ -882,10 +884,12 @@ fi %defattr(-,root,root) /usr/src/linux-%{KernelVer}/* /usr/src/linux-%{KernelVer}/.config -/usr/src/linux-%{KernelVer}/.scmversion %endif %changelog +* Tue Apr 25 2023 Xie XiuQi - 6.3.0-4.0.0.8 +- update to upstream v6.3 + * Tue Feb 7 2023 Zheng Zengkai - 6.1.8-3.0.0.7 - update to v6.1.8-3.0.0.7 - arm64/vmalloc: use module region only for module_alloc() if CONFIG_RANDOMIZE_BASE is set -- Gitee From 52dacbd3b25c5fded8912061ab5bc37172e264c7 Mon Sep 17 00:00:00 2001 From: Xie XiuQi Date: Fri, 20 Jan 2023 17:06:22 +0800 Subject: [PATCH 2/2] kernel.spec: tools lib traceevent: Remove libtraceevent After 4171925aa9f3 "tools lib traceevent: Remove libtraceevent", we remove traceevent from kernel.spec, use libtraceevent instead. Signed-off-by: Xie XiuQi --- kernel.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/kernel.spec b/kernel.spec index ed9acb6a..03e20bd7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -122,6 +122,7 @@ ExclusiveOS: Linux %if %{with_perf} BuildRequires: flex xz-devel libzstd-devel BuildRequires: java-devel +BuildRequires: libtraceevent-devel %endif BuildRequires: dwarves @@ -366,7 +367,7 @@ make ARCH=%{Arch} modules %{?_smp_mflags} %if %{with_perf} # perf %global perf_make \ - make EXTRA_CFLAGS="-Wl,-z,now -g -Wall -fstack-protector-strong -fPIC" EXTRA_PERFLIBS="-fpie -pie" %{?_smp_mflags} -s V=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 NO_STRLCPY=1 prefix=%{_prefix} + make EXTRA_CFLAGS="-Wl,-z,now -g -Wall -fstack-protector-strong -fPIC" EXTRA_PERFLIBS="-fpie -pie" %{?_smp_mflags} -s V=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 NO_STRLCPY=1 LIBTRACEEVENT_DYNAMIC=1 prefix=%{_prefix} %if 0%{?with_python2} %global perf_python2 -C tools/perf PYTHON=%{__python2} %global perf_python3 -C tools/python3-perf PYTHON=%{__python3} @@ -631,12 +632,13 @@ popd # perf # perf tool binary and supporting scripts/binaries %if 0%{?with_python2} -%{perf_make} %{perf_python2} DESTDIR=%{buildroot} lib=%{_lib} install-bin install-traceevent-plugins +%{perf_make} %{perf_python2} DESTDIR=%{buildroot} lib=%{_lib} install-bin %else -%{perf_make} %{perf_python3} DESTDIR=%{buildroot} lib=%{_lib} install-bin install-traceevent-plugins +%{perf_make} %{perf_python3} DESTDIR=%{buildroot} lib=%{_lib} install-bin %endif # remove the 'trace' symlink. rm -f %{buildroot}%{_bindir}/trace +rm -f %{buildroot}%{_bindir}/traceevent # remove examples rm -rf %{buildroot}/usr/lib/perf/examples -- Gitee