merge originkernel-5.18.0-0.rc6.220511.feb9c5e19e913b5.50.vanilla.1.fc37kernel-5.18.0-0.rc6.220511.feb9c5e19e913b5.50.vanilla.1.fc36kernel-5.18.0-0.rc6.220511.feb9c5e19e913b5.50.vanilla.1.fc35kernel-5.18.0-0.rc6.220511.feb9c5e19e913b5.50.vanilla.1.fc34

1 files changed, 3 insertions, 16 deletions

diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index eb566a1e3..6b76a24f5 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -227,7 +227,6 @@ CONFIG_AM335X_CONTROL_USB=m
 CONFIG_AM335X_PHY_USB=m
 CONFIG_AMBA_PL08X=y
 CONFIG_AMD8111_ETH=m
-# CONFIG_AMD_HSMP is not set
 # CONFIG_AMD_IOMMU_DEBUGFS is not set
 CONFIG_AMD_PHY=m
 CONFIG_AMD_PMC=m
@@ -355,10 +354,7 @@ CONFIG_ARM64_EPAN=y
 CONFIG_ARM64_ERRATUM_1319367=y
 CONFIG_ARM64_ERRATUM_1530923=y
 CONFIG_ARM64_ERRATUM_1542419=y
-CONFIG_ARM64_ERRATUM_1902691=y
-CONFIG_ARM64_ERRATUM_2038923=y
 CONFIG_ARM64_ERRATUM_2054223=y
-CONFIG_ARM64_ERRATUM_2064142=y
 CONFIG_ARM64_ERRATUM_2067961=y
 CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
@@ -2123,7 +2119,6 @@ CONFIG_EVM=y
 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
 CONFIG_EXFAT_FS=m
 # CONFIG_EXPERT is not set
-# CONFIG_EXPOLINE_EXTERN is not set
 CONFIG_EXPORTFS=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
@@ -2289,7 +2284,7 @@ CONFIG_FPGA_MGR_MACHXO2_SPI=m
 CONFIG_FPGA_MGR_XILINX_SPI=m
 CONFIG_FPGA_MGR_ZYNQ_FPGA=m
 CONFIG_FPGA_REGION=m
-# CONFIG_FPROBE is not set
+CONFIG_FPROBE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
@@ -3071,8 +3066,6 @@ CONFIG_INTEGRITY_PLATFORM_KEYRING=y
 CONFIG_INTEGRITY_SIGNATURE=y
 CONFIG_INTEGRITY_TRUSTED_KEYRING=y
 CONFIG_INTEGRITY=y
-# CONFIG_INTEL_CHTWC_INT33FE is not set
-# CONFIG_INTEL_HFI_THERMAL is not set
 # CONFIG_INTEL_IDMA64 is not set
 # CONFIG_INTEL_IDXD_COMPAT is not set
 CONFIG_INTEL_IDXD=m
@@ -3088,7 +3081,6 @@ CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_SAR_INT1092 is not set
 # CONFIG_INTEL_SCU_PCI is not set
 # CONFIG_INTEL_SCU_PLATFORM is not set
-# CONFIG_INTEL_SDSI is not set
 CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TCC_COOLING is not set
@@ -3773,7 +3765,6 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAILBOX=y
 # CONFIG_MANAGER_SBS is not set
 CONFIG_MANTIS_CORE=m
-# CONFIG_MARCH_Z16 is not set
 CONFIG_MARVELL_10G_PHY=m
 CONFIG_MARVELL_88X2222_PHY=m
 # CONFIG_MARVELL_CN10K_DDR_PMU is not set
@@ -4998,7 +4989,6 @@ CONFIG_NVME_FC=m
 CONFIG_NVME_HWMON=y
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
-# CONFIG_NVMEM_LAYERSCAPE_SFP is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_RMEM=m
 CONFIG_NVMEM_SNVS_LPGPR=m
@@ -6191,6 +6181,7 @@ CONFIG_S2IO=m
 # CONFIG_S390_KPROBES_SANITY_TEST is not set
 # CONFIG_S390_MODULES_SANITY_TEST is not set
 CONFIG_S3C2410_WATCHDOG=m
+# CONFIG_SAMPLE_FPROBE is not set
 # CONFIG_SAMPLES is not set
 CONFIG_SATA_ACARD_AHCI=m
 CONFIG_SATA_AHCI_PLATFORM=m
@@ -6435,7 +6426,6 @@ CONFIG_SENSORS_ARM_SCPI=m
 # CONFIG_SENSORS_AS370 is not set
 CONFIG_SENSORS_ASC7621=m
 CONFIG_SENSORS_ASPEED=m
-# CONFIG_SENSORS_ASUS_EC is not set
 # CONFIG_SENSORS_ASUS_WMI_EC is not set
 # CONFIG_SENSORS_ASUS_WMI is not set
 CONFIG_SENSORS_ATXP1=m
@@ -8026,7 +8016,6 @@ CONFIG_TULIP=m
 CONFIG_TULIP_MMIO=y
 # CONFIG_TULIP_MWI is not set
 # CONFIG_TULIP_NAPI is not set
-# CONFIG_TUNE_Z16 is not set
 CONFIG_TUN=m
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_TURRIS_MOX_RWTM=m
@@ -8792,7 +8781,7 @@ CONFIG_VIRTIO_CONSOLE=m
 CONFIG_VIRTIO_FS=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_IOMMU is not set
-# CONFIG_VIRTIO_MEM is not set
+CONFIG_VIRTIO_MEM=m
 CONFIG_VIRTIO_MENU=y
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
 CONFIG_VIRTIO_MMIO=m
@@ -8939,10 +8928,8 @@ CONFIG_WWAN=y
 # CONFIG_X25 is not set
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_IOPL_IOPERM=y
-# CONFIG_X86_KERNEL_IBT is not set
 CONFIG_X86_MCELOG_LEGACY=y
 CONFIG_X86_SGX_KVM=y
-# CONFIG_X86_X32_ABI is not set
 CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set