kernel: Update to 4.15.18

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 65f8848f76c01d5710950aa10de8d9f6a5b5a5f1..db89f3c4afb09693a2e31ae10eb946defec7f95a 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -142,7 +142,6 @@ CONFIG_OF_RESERVED_MEM=y
 # CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_BLK_DEV_RSXX is not set
-# CONFIG_BLK_DEV_NVME is not set
 
 #
 # Misc devices
@@ -284,9 +283,10 @@ CONFIG_I2C_MESON=m
 CONFIG_I2C_VERSATILE=m
 
 #
-# Pin controllers
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PINCTRL_MESON=y
+CONFIG_PINCTRL_MESON8_PMX=y
 
 #
 # Memory mapped GPIO drivers
@@ -459,6 +459,7 @@ CONFIG_SND_SOC=m
 CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 CONFIG_SND_SOC_AMD_ACP=m
+CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
 CONFIG_SND_ATMEL_SOC=m
 CONFIG_SND_DESIGNWARE_I2S=m
 
@@ -536,8 +537,10 @@ CONFIG_SND_SOC_PCM3168A_I2C=m
 CONFIG_SND_SOC_PCM512x=m
 CONFIG_SND_SOC_PCM512x_I2C=m
 CONFIG_SND_SOC_RL6231=m
+# CONFIG_SND_SOC_RT5514_SPI_BUILTIN is not set
 CONFIG_SND_SOC_RT5616=m
 CONFIG_SND_SOC_RT5631=m
+CONFIG_SND_SOC_RT5645=m
 # CONFIG_SND_SOC_RT5677_SPI is not set
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SIGMADSP=m
@@ -604,6 +607,7 @@ CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_MMC_ARMMMCI=m
 # CONFIG_MMC_RICOH_MMC is not set
 CONFIG_MMC_MESON_GX=m
+CONFIG_MMC_MESON_MX_SDIO=m
 CONFIG_MMC_DW=m
 CONFIG_MMC_DW_PLTFM=m
 CONFIG_MMC_DW_EXYNOS=m
@@ -678,6 +682,8 @@ CONFIG_IOMMU_DMA=y
 # Amlogic SoC drivers
 #
 CONFIG_MESON_GX_SOCINFO=y
+CONFIG_MESON_GX_PM_DOMAINS=y
+CONFIG_MESON_MX_SOCINFO=y
 
 #
 # Extcon Device Drivers
@@ -703,11 +709,17 @@ CONFIG_PWM_MESON=m
 CONFIG_PWM_STMPE=y
 # CONFIG_PWM_TWL is not set
 # CONFIG_PWM_TWL_LED is not set
+
+#
+# IRQ chip support
+#
 CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
+CONFIG_ARM_GIC_V3_ITS_PCI=y
 CONFIG_PARTITION_PERCPU=y
+CONFIG_MESON_IRQ_GPIO=y
 CONFIG_RESET_MESON=y
 
 #
@@ -721,6 +733,11 @@ CONFIG_PHY_MESON_GXL_USB2=y
 #
 CONFIG_ARM_PMU=y
 
+#
+# Android
+#
+CONFIG_MESON_MX_EFUSE=m
+
 #
 # Firmware Drivers
 #

diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic
index 28631e1fa88f938ab1befbc7637bb513d7f31e9b..35b003606d7c2dc1f019a493f22955ad514347b5 100644 (file)
--- a/kernel/config-arm32-generic
+++ b/kernel/config-arm32-generic
@@ -6,7 +6,6 @@ CONFIG_MIGHT_HAVE_PCI=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_NO_IOPORT_MAP=y
 CONFIG_ARCH_HAS_BANDGAP=y
-CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_ARM_PATCH_PHYS_VIRT=y
 
 #
@@ -22,7 +21,6 @@ CONFIG_KERNEL_XZ=y
 # RCU Subsystem
 #
 CONFIG_CONTEXT_TRACKING_FORCE=y
-CONFIG_PRINTK_NMI=y
 CONFIG_PERF_USE_VMALLOC=y
 
 #
@@ -83,6 +81,7 @@ CONFIG_ARCH_BCM=y
 #
 CONFIG_ARCH_BCM_IPROC=y
 # CONFIG_ARCH_BCM_CYGNUS is not set
+# CONFIG_ARCH_BCM_HR2 is not set
 # CONFIG_ARCH_BCM_NSP is not set
 CONFIG_ARCH_BCM_5301X=y
 
@@ -214,7 +213,6 @@ CONFIG_ARCH_EXYNOS5=y
 # EXYNOS SoCs
 #
 CONFIG_CPU_EXYNOS4210=y
-CONFIG_SOC_EXYNOS4212=y
 CONFIG_SOC_EXYNOS4412=y
 CONFIG_SOC_EXYNOS5250=y
 CONFIG_SOC_EXYNOS5260=y
@@ -345,6 +343,7 @@ CONFIG_PCI_IMX6=y
 CONFIG_PCI_KEYSTONE=y
 CONFIG_PCI_LAYERSCAPE=y
 CONFIG_PCIE_QCOM=y
+CONFIG_PCIE_HISI_STB=y
 
 #
 # PCI host controller drivers
@@ -352,6 +351,7 @@ CONFIG_PCIE_QCOM=y
 # CONFIG_PCI_FTPCI100 is not set
 CONFIG_PCI_TEGRA=y
 CONFIG_PCIE_XILINX=y
+CONFIG_PCI_V3_SEMI=y
 CONFIG_PCIE_IPROC=m
 CONFIG_PCIE_IPROC_PLATFORM=m
 # CONFIG_PCIE_IPROC_BCMA is not set
@@ -462,6 +462,7 @@ CONFIG_NEON=y
 #
 # Userspace binary formats
 #
+# CONFIG_BINFMT_ELF_FDPIC is not set
 # CONFIG_BINFMT_FLAT is not set
 
 #
@@ -496,6 +497,7 @@ CONFIG_OMAP_INTERCONNECT=y
 CONFIG_QCOM_EBI2=y
 CONFIG_SUNXI_RSB=m
 CONFIG_TEGRA_GMI=m
+CONFIG_TI_SYSC=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 
 #
@@ -713,7 +715,7 @@ CONFIG_PTP_1588_CLOCK=y
 CONFIG_PTP_1588_CLOCK_GIANFAR=m
 
 #
-# Pin controllers
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 # CONFIG_PINCTRL_AS3722 is not set
 CONFIG_PINCTRL_AMD=y
@@ -794,6 +796,8 @@ CONFIG_PINCTRL_MTK=y
 CONFIG_PINCTRL_MT8135=y
 CONFIG_PINCTRL_MT8127=y
 CONFIG_PINCTRL_MT6397=y
+CONFIG_PINCTRL_MESON8=y
+CONFIG_PINCTRL_MESON8B=y
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 
 #
@@ -851,6 +855,7 @@ CONFIG_MTK_THERMAL=m
 #
 # Broadcom thermal drivers
 #
+CONFIG_BRCMSTB_THERMAL=m
 CONFIG_BCM_NS_THERMAL=y
 
 #
@@ -975,6 +980,7 @@ CONFIG_VIDEO_STI_HVA=m
 CONFIG_VIDEO_STI_DELTA=m
 CONFIG_VIDEO_STI_DELTA_MJPEG=y
 CONFIG_VIDEO_STI_DELTA_DRIVER=m
+# CONFIG_VIDEO_ROCKCHIP_RGA is not set
 # CONFIG_VIDEO_TI_VPE is not set
 # CONFIG_VIDEO_QCOM_VENUS is not set
 CONFIG_DVB_C8SECTPFE=m
@@ -992,7 +998,7 @@ CONFIG_TEGRA_HOST1X_FIREWALL=y
 CONFIG_IMX_IPUV3_CORE=m
 
 #
-# ACP (Audio CoProcessor) Configuration
+# AMD Library routines
 #
 CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_DRM_EXYNOS=m
@@ -1025,6 +1031,7 @@ CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
+CONFIG_ROCKCHIP_LVDS=y
 CONFIG_DRM_ARMADA=m
 CONFIG_DRM_ATMEL_HLCDC=m
 CONFIG_DRM_SUN4I=m
@@ -1042,6 +1049,7 @@ CONFIG_OMAP2_DSS_DPI=y
 CONFIG_OMAP2_DSS_VENC=y
 CONFIG_OMAP2_DSS_HDMI_COMMON=y
 CONFIG_OMAP4_DSS_HDMI=y
+CONFIG_OMAP4_DSS_HDMI_CEC=y
 CONFIG_OMAP5_DSS_HDMI=y
 CONFIG_OMAP2_DSS_SDI=y
 CONFIG_OMAP2_DSS_DSI=y
@@ -1088,6 +1096,7 @@ CONFIG_DRM_ETNAVIV_THERMAL=y
 # CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set
 CONFIG_DRM_MEDIATEK=m
 CONFIG_DRM_MEDIATEK_HDMI=m
+# CONFIG_DRM_TVE200 is not set
 
 #
 # Frame buffer hardware drivers
@@ -1186,7 +1195,6 @@ CONFIG_SND_SOC_MAX98090=m
 CONFIG_SND_SOC_MAX98095=m
 CONFIG_SND_SOC_MAX98357A=m
 CONFIG_SND_SOC_RT5514=m
-CONFIG_SND_SOC_RT5645=m
 CONFIG_SND_SOC_RT5677=m
 CONFIG_SND_SOC_WM8994=m
 
@@ -1198,7 +1206,6 @@ CONFIG_USB_XHCI_TEGRA=m
 CONFIG_USB_EHCI_MXC=y
 CONFIG_USB_EHCI_HCD_OMAP=y
 CONFIG_USB_EHCI_HCD_STI=m
-CONFIG_USB_EHCI_MSM=y
 CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_EHCI_EXYNOS=y
 CONFIG_USB_OHCI_HCD_STI=m
@@ -1248,8 +1255,6 @@ CONFIG_USB_DWC3_ST=m
 CONFIG_KEYSTONE_USB_PHY=m
 CONFIG_AM335X_CONTROL_USB=m
 CONFIG_AM335X_PHY_USB=m
-CONFIG_USB_MSM_OTG=m
-CONFIG_USB_QCOM_8X16_PHY=m
 CONFIG_USB_MXS_PHY=m
 
 #
@@ -1312,6 +1317,7 @@ CONFIG_RTC_DRV_TEGRA=m
 CONFIG_RTC_DRV_MXC=m
 CONFIG_RTC_DRV_SIRFSOC=m
 CONFIG_RTC_DRV_ST_LPC=m
+CONFIG_RTC_DRV_MT7622=m
 
 #
 # DMA Devices
@@ -1335,6 +1341,11 @@ CONFIG_ST_FDMA=m
 # CONFIG_TI_EDMA is not set
 # CONFIG_QCOM_BAM_DMA is not set
 
+#
+# DMABUF options
+#
+# CONFIG_ARM_CHARLCD is not set
+
 #
 # Microsoft Hyper-V guest support
 #
@@ -1368,6 +1379,10 @@ CONFIG_COMMON_CLK_MT2701=y
 # CONFIG_COMMON_CLK_MT2701_HIFSYS is not set
 # CONFIG_COMMON_CLK_MT2701_ETHSYS is not set
 # CONFIG_COMMON_CLK_MT2701_BDPSYS is not set
+CONFIG_COMMON_CLK_MT7622=y
+CONFIG_COMMON_CLK_MT7622_ETHSYS=y
+CONFIG_COMMON_CLK_MT7622_HIFSYS=y
+CONFIG_COMMON_CLK_MT7622_AUDSYS=y
 CONFIG_COMMON_CLK_MT8135=y
 CONFIG_COMMON_CLK_MT8173=y
 CONFIG_COMMON_CLK_MESON8B=y
@@ -1483,20 +1498,18 @@ CONFIG_ST_SLIM_REMOTEPROC=m
 #
 # Rpmsg drivers
 #
-CONFIG_RPMSG=m
-CONFIG_RPMSG_CHAR=m
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
 CONFIG_RPMSG_QCOM_SMD=m
-CONFIG_RPMSG_VIRTIO=m
 
 #
 # Broadcom SoC drivers
 #
 CONFIG_SOC_BRCMSTB=y
+CONFIG_BRCMSTB_PM=y
 CONFIG_FSL_GUTS=y
 
 #
-# i.MX SoC drivers
+# MediaTek SoC drivers
 #
 # CONFIG_MTK_INFRACFG is not set
 # CONFIG_MTK_PMIC_WRAP is not set
@@ -1509,6 +1522,7 @@ CONFIG_FSL_GUTS=y
 CONFIG_QCOM_GSBI=m
 CONFIG_QCOM_MDT_LOADER=m
 CONFIG_QCOM_PM=y
+# CONFIG_QCOM_RMTFS_MEM is not set
 CONFIG_QCOM_SMEM=m
 CONFIG_QCOM_SMD_RPM=m
 # CONFIG_QCOM_SMP2P is not set
@@ -1600,6 +1614,10 @@ CONFIG_PWM_SUN4I=m
 # CONFIG_PWM_TIECAP is not set
 # CONFIG_PWM_TIEHRPWM is not set
 # CONFIG_PWM_VT8500 is not set
+
+#
+# IRQ chip support
+#
 CONFIG_GIC_NON_BANKED=y
 CONFIG_BCM7120_L2_IRQ=y
 CONFIG_BRCMSTB_L2_IRQ=y
@@ -1610,6 +1628,7 @@ CONFIG_IRQ_CROSSBAR=y
 # CONFIG_KEYSTONE_IRQ is not set
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_RESET_BERLIN=y
+CONFIG_RESET_SIMPLE=y
 CONFIG_RESET_SUNXI=y
 CONFIG_RESET_TI_SCI=m
 CONFIG_RESET_ZYNQ=y
@@ -1628,6 +1647,7 @@ CONFIG_PHY_BCM_NS_USB3=m
 CONFIG_PHY_NS2_PCIE=y
 CONFIG_PHY_NS2_USB_DRD=y
 CONFIG_PHY_BRCM_SATA=y
+CONFIG_PHY_BRCM_USB=m
 CONFIG_PHY_HIX5HD2_SATA=m
 CONFIG_PHY_BERLIN_SATA=m
 CONFIG_PHY_BERLIN_USB=m
@@ -1669,6 +1689,7 @@ CONFIG_ROCKCHIP_EFUSE=m
 CONFIG_NVMEM_BCM_OCOTP=m
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_NVMEM_VF610_OCOTP=m
+CONFIG_NVMEM_SNVS_LPGPR=m
 
 #
 # FSI support
@@ -1687,6 +1708,7 @@ CONFIG_NVMEM_VF610_OCOTP=m
 #
 CONFIG_QCOM_SCM=y
 CONFIG_QCOM_SCM_32=y
+# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_TI_SCI_PROTOCOL=m
 CONFIG_BCM47XX_NVRAM=y
 # CONFIG_BCM47XX_SPROM is not set

diff --git a/kernel/config-arm64-generic b/kernel/config-arm64-generic
index 7e4fd31ab3ba49b4bf31385b8aa57061800162fd..e49a4d2bdafa6d1db9763071bddad0c0a356cc96 100644 (file)
--- a/kernel/config-arm64-generic
+++ b/kernel/config-arm64-generic
@@ -31,6 +31,7 @@ CONFIG_SYSCTL_EXCEPTION_TRACE=y
 # Kernel Performance Events And Counters
 #
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_ARCH_MMAP_RND_BITS=27
@@ -49,6 +50,36 @@ CONFIG_BLOCK_COMPAT=y
 # IO Schedulers
 #
 CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_ARCH_INLINE_READ_LOCK=y
+CONFIG_ARCH_INLINE_READ_LOCK_BH=y
+CONFIG_ARCH_INLINE_READ_LOCK_IRQ=y
+CONFIG_ARCH_INLINE_READ_LOCK_IRQSAVE=y
+CONFIG_ARCH_INLINE_READ_UNLOCK=y
+CONFIG_ARCH_INLINE_READ_UNLOCK_BH=y
+CONFIG_ARCH_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_ARCH_INLINE_READ_UNLOCK_IRQRESTORE=y
+CONFIG_ARCH_INLINE_WRITE_LOCK=y
+CONFIG_ARCH_INLINE_WRITE_LOCK_BH=y
+CONFIG_ARCH_INLINE_WRITE_LOCK_IRQ=y
+CONFIG_ARCH_INLINE_WRITE_LOCK_IRQSAVE=y
+CONFIG_ARCH_INLINE_WRITE_UNLOCK=y
+CONFIG_ARCH_INLINE_WRITE_UNLOCK_BH=y
+CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE=y
+CONFIG_INLINE_READ_LOCK=y
+CONFIG_INLINE_READ_LOCK_BH=y
+CONFIG_INLINE_READ_LOCK_IRQ=y
+CONFIG_INLINE_READ_LOCK_IRQSAVE=y
+CONFIG_INLINE_READ_UNLOCK_BH=y
+CONFIG_INLINE_READ_UNLOCK_IRQRESTORE=y
+CONFIG_INLINE_WRITE_LOCK=y
+CONFIG_INLINE_WRITE_LOCK_BH=y
+CONFIG_INLINE_WRITE_LOCK_IRQ=y
+CONFIG_INLINE_WRITE_LOCK_IRQSAVE=y
+CONFIG_INLINE_WRITE_UNLOCK_BH=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE=y
+CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
+CONFIG_QUEUED_RWLOCKS=y
 
 #
 # Platform selection
@@ -66,6 +97,7 @@ CONFIG_PREEMPT_NOTIFIERS=y
 # CONFIG_ARCH_REALTEK is not set
 # CONFIG_ARCH_ROCKCHIP is not set
 CONFIG_ARCH_SEATTLE=y
+# CONFIG_ARCH_SYNQUACER is not set
 # CONFIG_ARCH_STRATIX10 is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_SPRD is not set
@@ -108,7 +140,6 @@ CONFIG_ARM64_ERRATUM_832075=y
 CONFIG_ARM64_ERRATUM_834220=y
 CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_843419=y
-CONFIG_ARM64_ERRATUM_1024718=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
@@ -117,6 +148,8 @@ CONFIG_CAVIUM_ERRATUM_30115=y
 CONFIG_QCOM_FALKOR_ERRATUM_1003=y
 CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
+# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set
+# CONFIG_HISILICON_ERRATUM_161600802 is not set
 CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
 # CONFIG_ARM64_4K_PAGES is not set
 # CONFIG_ARM64_16K_PAGES is not set
@@ -154,7 +187,6 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
-CONFIG_ARM64_SSBD=y
 CONFIG_ARMV8_DEPRECATED=y
 CONFIG_SWP_EMULATION=y
 CONFIG_CP15_BARRIER_EMULATION=y
@@ -174,6 +206,7 @@ CONFIG_ARM64_VHE=y
 #
 CONFIG_ARM64_UAO=y
 # CONFIG_ARM64_PMEM is not set
+CONFIG_ARM64_SVE=y
 CONFIG_ARM64_MODULE_CMODEL_LARGE=y
 CONFIG_ARM64_MODULE_PLTS=y
 CONFIG_RELOCATABLE=y
@@ -344,13 +377,15 @@ CONFIG_PPS=m
 CONFIG_PTP_1588_CLOCK=m
 
 #
-# Pin controllers
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PINCTRL_AS3722=m
 CONFIG_PINCTRL_AMD=m
 CONFIG_PINCTRL_MCP23S08=m
 CONFIG_PINCTRL_SINGLE=m
 CONFIG_PINCTRL_PALMAS=m
+CONFIG_PINCTRL_MESON_GXBB=y
+CONFIG_PINCTRL_MESON_GXL=y
 CONFIG_GPIO_ACPI=y
 
 #
@@ -451,7 +486,6 @@ CONFIG_USB_DWC3_PCI=m
 # MMC/SD/SDIO Host Controller Drivers
 #
 CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_CAVIUM_THUNDERX=m
 
 #
 # iptables trigger is under Netfilter config (LED target)
@@ -486,6 +520,11 @@ CONFIG_XGENE_DMA=m
 #
 CONFIG_DMA_ENGINE_RAID=y
 
+#
+# DMABUF options
+#
+CONFIG_IRQ_BYPASS_MANAGER=y
+
 #
 # Microsoft Hyper-V guest support
 #
@@ -508,7 +547,6 @@ CONFIG_ARM64_ERRATUM_858921=y
 # CONFIG_PL320_MBOX is not set
 CONFIG_PCC=y
 CONFIG_XGENE_SLIMPRO_MBOX=m
-CONFIG_BCM_FLEXRM_MBOX=m
 
 #
 # Generic IOMMU Pagetable Support
@@ -543,9 +581,10 @@ CONFIG_DEVFREQ_GOV_PASSIVE=m
 # CONFIG_ACPI_ALS is not set
 
 #
-# Temperature sensors
+# IRQ chip support
 #
 # CONFIG_RESET_BERLIN is not set
+# CONFIG_RESET_SIMPLE is not set
 # CONFIG_RESET_SUNXI is not set
 # CONFIG_RESET_ZYNQ is not set
 
@@ -561,7 +600,9 @@ CONFIG_PHY_XGENE=m
 # Performance monitor support
 #
 CONFIG_ARM_PMU_ACPI=y
+# CONFIG_HISI_PMU is not set
 CONFIG_XGENE_PMU=y
+# CONFIG_ARM_SPE_PMU is not set
 
 #
 # Android
@@ -650,6 +691,7 @@ CONFIG_ACPI_WATCHDOG=y
 # CONFIG_ACPI_CONFIGFS is not set
 CONFIG_ACPI_IORT=y
 CONFIG_ACPI_GTDT=y
+# CONFIG_TPS68470_PMIC_OPREGION is not set
 
 #
 # File systems
@@ -688,6 +730,7 @@ CONFIG_ARCH_HAS_KCOV=y
 # RCU Debugging
 #
 CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_HIST_TRIGGERS is not set
 
 #
 # Runtime Testing

diff --git a/kernel/config-generic b/kernel/config-generic
index 2cd712bb8a3a2308f45698af3e8f723f41f05c43..eeb95ee27e1c595eb7a13c9ffd57a244c1754cb0 100644 (file)
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -32,7 +32,6 @@ CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_CROSS_MEMORY_ATTACH=y
-CONFIG_FHANDLE=y
 # CONFIG_USELIB is not set
 # CONFIG_AUDIT is not set
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
@@ -82,6 +81,7 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_CPU_ISOLATION=y
 
 #
 # RCU Subsystem
@@ -119,7 +119,6 @@ CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_BPF=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_SOCK_CGROUP_DATA=y
-# CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
@@ -149,11 +148,10 @@ CONFIG_MULTIUSER=y
 CONFIG_SGETMASK_SYSCALL=y
 CONFIG_SYSFS_SYSCALL=y
 # CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_FHANDLE=y
 CONFIG_POSIX_TIMERS=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_PRINTK=y
+CONFIG_PRINTK_NMI=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
@@ -163,14 +161,17 @@ CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
 CONFIG_ADVISE_SYSCALLS=y
-# CONFIG_USERFAULTFD is not set
-CONFIG_PCI_QUIRKS=y
 CONFIG_MEMBARRIER=y
+# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
+# CONFIG_USERFAULTFD is not set
 CONFIG_EMBEDDED=y
 CONFIG_HAVE_PERF_EVENTS=y
 # CONFIG_PC104 is not set
@@ -190,7 +191,7 @@ CONFIG_SLAB_MERGE_DEFAULT=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
 CONFIG_SLUB_CPU_PARTIAL=y
-# CONFIG_SYSTEM_DATA_VERIFICATION is not set
+CONFIG_SYSTEM_DATA_VERIFICATION=y
 # CONFIG_PROFILING is not set
 CONFIG_TRACEPOINTS=y
 # CONFIG_KPROBES is not set
@@ -201,6 +202,7 @@ CONFIG_UPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_NMI=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
@@ -375,6 +377,7 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_FRAME_VECTOR=y
 # CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_BENCHMARK is not set
 CONFIG_SECCOMP=y
 # CONFIG_HZ_250 is not set
 # CONFIG_HZ_1000 is not set
@@ -395,7 +398,6 @@ CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_WAKELOCKS is not set
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
-CONFIG_PM_OPP=y
 CONFIG_PM_CLK=y
 CONFIG_PM_GENERIC_DOMAINS=y
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
@@ -456,8 +458,8 @@ CONFIG_PCIE_PME=y
 # CONFIG_PCIE_PTM 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
 CONFIG_HOTPLUG_PCI=y
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
@@ -872,9 +874,6 @@ CONFIG_NF_CONNTRACK_IPV6=y
 CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TABLES_IPV6=m
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_REDIR_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
 CONFIG_NFT_FIB_IPV6=m
@@ -882,7 +881,10 @@ CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
 CONFIG_NF_NAT_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
 CONFIG_NF_NAT_MASQUERADE_IPV6=m
+CONFIG_NFT_MASQ_IPV6=m
+CONFIG_NFT_REDIR_IPV6=m
 # CONFIG_IP6_NF_IPTABLES is not set
 CONFIG_NF_TABLES_BRIDGE=m
 CONFIG_NFT_BRIDGE_META=m
@@ -939,6 +941,7 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=y
 CONFIG_NET_DSA_TAG_BRCM=y
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
 CONFIG_NET_DSA_TAG_DSA=y
 CONFIG_NET_DSA_TAG_EDSA=y
 CONFIG_NET_DSA_TAG_LAN9303=y
@@ -974,6 +977,7 @@ CONFIG_NET_SCH_SFB=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCH_NETEM=m
@@ -1049,6 +1053,7 @@ CONFIG_BATMAN_ADV_DEBUGFS=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
 # CONFIG_OPENVSWITCH is not set
 CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS_DIAG=m
 CONFIG_VIRTIO_VSOCKETS=m
 CONFIG_VIRTIO_VSOCKETS_COMMON=m
 CONFIG_NETLINK_DIAG=m
@@ -1107,6 +1112,7 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIUART_INTEL=y
 CONFIG_BT_HCIUART_QCA=y
 CONFIG_BT_HCIUART_AG6XX=y
@@ -1132,9 +1138,10 @@ CONFIG_CFG80211=m
 # CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
 # CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_CRDA_SUPPORT=y
 CONFIG_CFG80211_WEXT=y
 CONFIG_CFG80211_WEXT_EXPORT=y
@@ -1204,6 +1211,7 @@ CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPMI=m
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_HWSPINLOCK=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
 
@@ -1216,6 +1224,7 @@ CONFIG_PROC_EVENTS=y
 # CONFIG_MTD is not set
 CONFIG_OF=y
 # CONFIG_OF_UNITTEST is not set
+CONFIG_OF_KOBJ=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_ADDRESS_PCI=y
@@ -1231,6 +1240,7 @@ CONFIG_OF_PCI_IRQ=y
 #
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
+CONFIG_CDROM=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
@@ -1244,7 +1254,13 @@ CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_VIRTIO_BLK=m
 CONFIG_VIRTIO_BLK_SCSI=y
 # CONFIG_BLK_DEV_RBD is not set
-CONFIG_NVME_CORE=m
+
+#
+# NVME Support
+#
+CONFIG_NVME_CORE=y
+CONFIG_BLK_DEV_NVME=y
+CONFIG_NVME_MULTIPATH=y
 CONFIG_NVME_FABRICS=m
 CONFIG_NVME_FC=m
 CONFIG_NVME_TARGET=m
@@ -1291,11 +1307,11 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 #
 CONFIG_TI_ST=m
 # CONFIG_SENSORS_LIS3_I2C is not set
+CONFIG_ALTERA_STAPL=m
 
 #
-# Altera FPGA firmware download module
+# Intel MIC & related support
 #
-CONFIG_ALTERA_STAPL=m
 
 #
 # Intel MIC Bus Driver
@@ -1764,6 +1780,7 @@ CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_CORE=m
 # CONFIG_MLX4_DEBUG is not set
+CONFIG_MLX4_CORE_GEN2=y
 # CONFIG_MLX5_CORE is not set
 CONFIG_MLXSW_CORE=m
 CONFIG_MLXSW_CORE_HWMON=y
@@ -1809,6 +1826,7 @@ CONFIG_QED_LL2=y
 CONFIG_QEDE=m
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
+CONFIG_QED_OOO=y
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCOM_EMAC=m
 # CONFIG_RMNET is not set
@@ -1895,6 +1913,7 @@ CONFIG_BROADCOM_PHY=m
 CONFIG_CICADA_PHY=m
 CONFIG_CORTINA_PHY=m
 CONFIG_DAVICOM_PHY=m
+CONFIG_DP83822_PHY=m
 CONFIG_DP83848_PHY=m
 CONFIG_DP83867_PHY=m
 CONFIG_FIXED_PHY=y
@@ -1910,6 +1929,7 @@ CONFIG_MICROSEMI_PHY=m
 CONFIG_NATIONAL_PHY=m
 CONFIG_QSEMI_PHY=m
 CONFIG_REALTEK_PHY=m
+CONFIG_RENESAS_PHY=m
 CONFIG_ROCKCHIP_PHY=m
 CONFIG_SMSC_PHY=m
 CONFIG_STE10XP=m
@@ -2405,6 +2425,7 @@ CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
 CONFIG_HVC_DRIVER=y
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PROC_INTERFACE is not set
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
 CONFIG_IPMI_SI=m
@@ -2538,10 +2559,6 @@ CONFIG_HSI_CHAR=m
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PINCTRL=y
-
-#
-# Pin controllers
-#
 CONFIG_GENERIC_PINCTRL_GROUPS=y
 CONFIG_PINMUX=y
 CONFIG_GENERIC_PINMUX_FUNCTIONS=y
@@ -2567,6 +2584,7 @@ CONFIG_GPIO_AXP209=m
 CONFIG_GPIO_EXAR=m
 # CONFIG_GPIO_FTGPIO010 is not set
 CONFIG_GPIO_GENERIC_PLATFORM=y
+CONFIG_GPIO_MB86S7X=m
 CONFIG_GPIO_MOCKUP=m
 CONFIG_GPIO_SYSCON=m
 
@@ -2583,7 +2601,6 @@ CONFIG_GPIO_ADNP=m
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_SX150X is not set
 CONFIG_GPIO_TPIC2810=m
 
 #
@@ -2645,6 +2662,7 @@ CONFIG_BATTERY_ACT8945A=m
 # CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_CHARGER_SBS is not set
+# CONFIG_MANAGER_SBS is not set
 # CONFIG_BATTERY_BQ27XXX is not set
 # CONFIG_AXP20X_POWER is not set
 # CONFIG_AXP288_CHARGER is not set
@@ -2728,6 +2746,7 @@ CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_MAX1668=m
 CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX6621=m
 CONFIG_SENSORS_MAX6639=m
 CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
@@ -2769,6 +2788,7 @@ CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_LTC3815=m
 CONFIG_SENSORS_MAX16064=m
 CONFIG_SENSORS_MAX20751=m
+CONFIG_SENSORS_MAX31785=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
 CONFIG_SENSORS_TPS40422=m
@@ -3674,9 +3694,25 @@ CONFIG_DRM_AMDGPU_USERPTR=y
 # ACP (Audio CoProcessor) Configuration
 #
 CONFIG_DRM_AMD_ACP=y
+
+#
+# Display Engine Configuration
+#
+CONFIG_DRM_AMD_DC=y
+# CONFIG_DRM_AMD_DC_PRE_VEGA is not set
+# CONFIG_DRM_AMD_DC_FBC is not set
+# CONFIG_DEBUG_KERNEL_DC is not set
+
+#
+# AMD Library routines
+#
+CONFIG_CHASH=m
+# CONFIG_CHASH_STATS is not set
+# CONFIG_CHASH_SELFTEST is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+# CONFIG_NOUVEAU_DEBUG_MMU is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 
 #
@@ -3700,9 +3736,13 @@ CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_SIMPLE=m
 CONFIG_DRM_PANEL_INNOLUX_P079ZCA=m
 CONFIG_DRM_PANEL_JDI_LT070ME05000=m
+# CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set
 CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
+# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
 CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2=m
+# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
 CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
+# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
 CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
 CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
 CONFIG_DRM_BRIDGE=y
@@ -3719,6 +3759,7 @@ CONFIG_DRM_NXP_PTN3460=m
 CONFIG_DRM_PARADE_PS8622=m
 CONFIG_DRM_SIL_SII8620=m
 CONFIG_DRM_SII902X=m
+CONFIG_DRM_SII9234=m
 CONFIG_DRM_TOSHIBA_TC358767=m
 CONFIG_DRM_TI_TFP410=m
 # CONFIG_DRM_I2C_ADV7511 is not set
@@ -4339,11 +4380,11 @@ CONFIG_TAHVO_USB=m
 # CONFIG_TAHVO_USB_HOST_BY_DEFAULT is not set
 CONFIG_USB_ISP1301=m
 # CONFIG_USB_GADGET is not set
-
-#
-# USB Power Delivery and Type-C drivers
-#
+CONFIG_TYPEC=m
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_FUSB302=m
 # CONFIG_TYPEC_UCSI is not set
+CONFIG_TYPEC_TPS6598X=m
 CONFIG_USB_LED_TRIG=y
 CONFIG_USB_ULPI_BUS=m
 # CONFIG_UWB is not set
@@ -4377,6 +4418,7 @@ CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_TOSHIBA_PCI=m
 CONFIG_MMC_MTK=m
 CONFIG_MMC_SDHCI_XENON=m
+CONFIG_MMC_SDHCI_OMAP=m
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
 
@@ -4459,6 +4501,7 @@ CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 # CONFIG_LEDS_TRIGGER_CPU is not set
+CONFIG_LEDS_TRIGGER_ACTIVITY=m
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 
@@ -4518,6 +4561,7 @@ CONFIG_RTC_DRV_ISL12022=m
 CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF85363=m
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
@@ -4669,7 +4713,7 @@ CONFIG_COMMON_CLK_PALMAS=m
 # CONFIG_COMMON_CLK_PXA is not set
 # CONFIG_COMMON_CLK_PIC32 is not set
 CONFIG_COMMON_CLK_VC5=m
-CONFIG_HWSPINLOCK=m
+CONFIG_HWSPINLOCK=y
 
 #
 # Clock Source drivers
@@ -4699,7 +4743,10 @@ CONFIG_OF_IOMMU=y
 #
 # Rpmsg drivers
 #
+CONFIG_RPMSG=m
+CONFIG_RPMSG_CHAR=m
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
+CONFIG_RPMSG_VIRTIO=m
 
 #
 # SOC (System On Chip) specific Drivers
@@ -4776,6 +4823,7 @@ CONFIG_DMARD06=m
 CONFIG_DMARD09=m
 # CONFIG_DMARD10 is not set
 # CONFIG_HID_SENSOR_ACCEL_3D is not set
+# CONFIG_IIO_CROS_EC_ACCEL_LEGACY is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_KXSD9 is not set
 CONFIG_KXCJK1013=m
@@ -4853,6 +4901,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_AD5446 is not set
 # CONFIG_AD5593R is not set
 # CONFIG_DPOT_DAC is not set
+# CONFIG_DS4424 is not set
 # CONFIG_M62332 is not set
 # CONFIG_MAX517 is not set
 CONFIG_MAX5821=m
@@ -5024,6 +5073,7 @@ CONFIG_IIO_ST_PRESS_I2C=m
 # Proximity and distance sensors
 #
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_RFD77402 is not set
 # CONFIG_SRF04 is not set
 # CONFIG_SX9500 is not set
 # CONFIG_SRF08 is not set
@@ -5039,17 +5089,20 @@ CONFIG_TMP007=m
 # CONFIG_TSYS02D is not set
 # CONFIG_NTB is not set
 # CONFIG_VME_BUS is not set
+
+#
+# IRQ chip support
+#
 CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_IPACK_BUS is not set
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_ATH79 is not set
+# CONFIG_RESET_AXS10X is not set
 # CONFIG_RESET_IMX7 is not set
 # CONFIG_RESET_LANTIQ is not set
 # CONFIG_RESET_LPC18XX is not set
 # CONFIG_RESET_PISTACHIO is not set
-# CONFIG_RESET_SOCFPGA is not set
-# CONFIG_RESET_STM32 is not set
 CONFIG_RESET_TI_SYSCON=m
 # CONFIG_RESET_TEGRA_BPMP is not set
 # CONFIG_FMC is not set
@@ -5098,6 +5151,7 @@ CONFIG_MULTIPLEXER=m
 #
 # Multiplexer drivers
 #
+CONFIG_PM_OPP=y
 
 #
 # Firmware Drivers
@@ -5135,6 +5189,7 @@ CONFIG_XFS_FS=m
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
 CONFIG_XFS_RT=y
+CONFIG_XFS_ONLINE_SCRUB=y
 # CONFIG_XFS_WARN is not set
 # CONFIG_XFS_DEBUG is not set
 # CONFIG_GFS2_FS is not set
@@ -5166,6 +5221,7 @@ CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
 CONFIG_OVERLAY_FS=m
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set
 # CONFIG_OVERLAY_FS_INDEX is not set
 
 #
@@ -5477,6 +5533,7 @@ CONFIG_GENERIC_TRACER=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
+# CONFIG_PREEMPTIRQ_EVENTS is not set
 # CONFIG_IRQSOFF_TRACER is not set
 CONFIG_SCHED_TRACER=y
 # CONFIG_HWLAT_TRACER is not set
@@ -5524,6 +5581,7 @@ CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
+# CONFIG_TEST_FIND_BIT is not set
 # CONFIG_TEST_FIRMWARE is not set
 # CONFIG_TEST_SYSCTL is not set
 # CONFIG_TEST_UDELAY is not set
@@ -5661,6 +5719,7 @@ CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SHA3=m
+# CONFIG_CRYPTO_SM3 is not set
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 
@@ -5719,7 +5778,9 @@ CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
 CONFIG_X509_CERTIFICATE_PARSER=y
-CONFIG_PKCS7_MESSAGE_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
 
 #
 # Certificates for signature checking
@@ -5746,7 +5807,6 @@ CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_IO=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y

diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 5c0c8dbc03c22c049d081731364e768477911bd5..d4604a5a4c45a2d2e4692e925ed86396cf3564d1 100644 (file)
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -40,6 +40,8 @@ CONFIG_KERNEL_XZ=y
 #
 CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
+CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
 CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
@@ -54,14 +56,12 @@ CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_ARCH_SUPPORTS_INT128=y
 # CONFIG_NUMA_BALANCING is not set
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
-CONFIG_PRINTK_NMI=y
 CONFIG_PCSPKR_PLATFORM=y
+CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
 
 #
 # Kernel Performance Events And Counters
 #
-CONFIG_HOTPLUG_SMT=y
 CONFIG_OPROFILE_NMI_TIMER=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_USER_RETURN_NOTIFIER=y
@@ -229,6 +229,7 @@ CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
 CONFIG_X86_SMAP=y
+CONFIG_X86_INTEL_UMIP=y
 CONFIG_X86_INTEL_MPX=y
 CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
 CONFIG_EFI=y
@@ -267,6 +268,7 @@ CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
 CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
 CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
 # CONFIG_ACPI_DEBUGGER is not set
+CONFIG_ACPI_LPIT=y
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS_POWER is not set
 CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
@@ -312,6 +314,7 @@ CONFIG_ACPI_WATCHDOG=y
 CONFIG_ACPI_EXTLOG=m
 # CONFIG_PMIC_OPREGION is not set
 # CONFIG_ACPI_CONFIGFS is not set
+# CONFIG_TPS68470_PMIC_OPREGION is not set
 CONFIG_SFI=y
 
 #
@@ -348,8 +351,8 @@ CONFIG_PCIEAER_INJECT=m
 # CONFIG_PCIEASPM_DEFAULT is not set
 CONFIG_PCIEASPM_POWERSAVE=y
 CONFIG_PCI_BUS_ADDR_T_64BIT=y
+# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
 CONFIG_PCI_STUB=y
-CONFIG_HT_IRQ=y
 CONFIG_PCI_ATS=y
 CONFIG_PCI_LOCKLESS_CONFIG=y
 CONFIG_PCI_IOV=y
@@ -448,7 +451,6 @@ CONFIG_BLK_DEV_SKD=m
 CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_RAM_SIZE=16384
 CONFIG_BLK_DEV_RSXX=m
-CONFIG_BLK_DEV_NVME=m
 
 #
 # Misc devices
@@ -461,7 +463,7 @@ CONFIG_VMWARE_BALLOON=m
 # CONFIG_SRAM is not set
 
 #
-# Altera FPGA firmware download module
+# Texas Instruments shared transport line discipline
 #
 CONFIG_INTEL_MEI=m
 CONFIG_INTEL_MEI_ME=m
@@ -618,6 +620,7 @@ CONFIG_IPW2200_QOS=y
 #
 CONFIG_VMXNET3=m
 # CONFIG_FUJITSU_ES is not set
+CONFIG_THUNDERBOLT_NET=m
 
 #
 # Input device support
@@ -759,10 +762,6 @@ CONFIG_PTP_1588_CLOCK=m
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_PTP_1588_CLOCK_KVM=m
-
-#
-# Pin controllers
-#
 # CONFIG_PINCTRL_AS3722 is not set
 CONFIG_PINCTRL_AMD=y
 CONFIG_PINCTRL_MCP23S08=m
@@ -773,6 +772,7 @@ CONFIG_PINCTRL_CHERRYVIEW=m
 CONFIG_PINCTRL_INTEL=m
 CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_CANNONLAKE=m
+CONFIG_PINCTRL_CEDARFORK=m
 CONFIG_PINCTRL_DENVERTON=m
 CONFIG_PINCTRL_GEMINILAKE=m
 CONFIG_PINCTRL_LEWISBURG=m
@@ -920,6 +920,7 @@ CONFIG_LPC_ICH=m
 CONFIG_INTEL_SOC_PMIC=y
 CONFIG_INTEL_SOC_PMIC_BXTWC=m
 CONFIG_INTEL_SOC_PMIC_CHTWC=y
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 CONFIG_MFD_INTEL_LPSS=m
 CONFIG_MFD_INTEL_LPSS_ACPI=m
 CONFIG_MFD_INTEL_LPSS_PCI=m
@@ -1094,7 +1095,12 @@ CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM_I2C_NXP_TDA998X=m
 
 #
-# ACP (Audio CoProcessor) Configuration
+# Display Engine Configuration
+#
+CONFIG_DRM_AMD_DC_DCN1_0=y
+
+#
+# AMD Library routines
 #
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_ALPHA_SUPPORT=y
@@ -1209,6 +1215,7 @@ CONFIG_MEMSTICK_REALTEK_PCI=m
 #
 # LED drivers
 #
+CONFIG_LEDS_APU=m
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_INTEL_SS4200=m
 
@@ -1287,8 +1294,11 @@ CONFIG_ACERHDF=m
 CONFIG_ALIENWARE_WMI=m
 CONFIG_ASUS_LAPTOP=m
 CONFIG_DELL_SMBIOS=m
+CONFIG_DELL_SMBIOS_WMI=m
+CONFIG_DELL_SMBIOS_SMM=m
 CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_DESCRIPTOR=m
 CONFIG_DELL_WMI_AIO=m
 CONFIG_DELL_WMI_LED=m
 CONFIG_DELL_SMO8800=m
@@ -1321,6 +1331,7 @@ CONFIG_EEEPC_WMI=m
 CONFIG_ASUS_WIRELESS=m
 CONFIG_ACPI_WMI=m
 CONFIG_WMI_BMOF=m
+CONFIG_INTEL_WMI_THUNDERBOLT=m
 CONFIG_MSI_WMI=m
 CONFIG_PEAQ_WMI=m
 CONFIG_TOPSTAR_LAPTOP=m
@@ -1422,8 +1433,14 @@ CONFIG_TWL6030_GPADC=m
 # Temperature sensors
 #
 # CONFIG_PWM is not set
+
+#
+# IRQ chip support
+#
+# CONFIG_ARM_GIC_V3_ITS is not set
 # CONFIG_RESET_BERLIN is not set
 # CONFIG_RESET_MESON is not set
+# CONFIG_RESET_SIMPLE is not set
 # CONFIG_RESET_SUNXI is not set
 # CONFIG_RESET_ZYNQ is not set
 
@@ -1630,6 +1647,7 @@ CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
 CONFIG_CRYPTO_CAST5_AVX_X86_64=m
 CONFIG_CRYPTO_CAST6_AVX_X86_64=m
 CONFIG_CRYPTO_DES3_EDE_X86_64=m
+CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_CHACHA20_X86_64=m
 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 CONFIG_CRYPTO_SERPENT_AVX_X86_64=m

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index a0735012b0db1e7f10dbb23fb0d33f1d05bc9a93..22d073a658eac17ad085283ec5668f1d80a644e2 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = kernel
-version    = 4.14.71
+version    = 4.15.18
 release    = 1
 thisapp    = linux-%{version}