kernel: update to 4.7.9

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index bbff1929c5b94df19f7683fbde75cd60148ad49a..c6b750fd52b0587428d3952675aa9347bf6100f3 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -45,6 +45,7 @@ CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCI_MSI is not set
 # CONFIG_PCI_STUB is not set
+CONFIG_PCI_ECAM=y
 # CONFIG_PCI_IOV is not set
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_PASID is not set
@@ -412,12 +413,6 @@ CONFIG_DVB_STV0297=y
 #
 CONFIG_DVB_LNBP21=y
 
-#
-# Graphics support
-#
-CONFIG_DRM_GEM_CMA_HELPER=y
-CONFIG_DRM_KMS_CMA_HELPER=y
-
 #
 # I2C encoder or helper chips
 #
@@ -523,6 +518,7 @@ CONFIG_SND_SOC_STI_SAS=m
 CONFIG_SND_SOC_TAS2552=m
 CONFIG_SND_SOC_TAS5086=m
 CONFIG_SND_SOC_TAS571X=m
+CONFIG_SND_SOC_TAS5720=m
 CONFIG_SND_SOC_TFA9879=m
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC23_I2C=m
@@ -543,6 +539,7 @@ CONFIG_SND_SOC_WM8776=m
 CONFIG_SND_SOC_WM8804=m
 CONFIG_SND_SOC_WM8804_I2C=m
 CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8960=m
 CONFIG_SND_SOC_WM8962=m
 CONFIG_SND_SOC_WM8974=m
 CONFIG_SND_SOC_WM8978=m
@@ -582,11 +579,12 @@ CONFIG_RTC_DRV_PL031=m
 #
 # CONFIG_AMBA_PL08X is not set
 # CONFIG_PL330_DMA is not set
+CONFIG_XILINX_VDMA=m
 # CONFIG_DW_DMAC is not set
 # CONFIG_DW_DMAC_PCI is not set
 
 #
-# DMA Clients
+# DMABUF options
 #
 # CONFIG_UIO_AEC is not set
 # CONFIG_UIO_SERCOS3 is not set
@@ -649,6 +647,7 @@ CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_TWL_LED is not set
 CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_V3=y
+CONFIG_PARTITION_PERCPU=y
 
 #
 # Performance monitor support

diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic
index d19225050bade636ab51bf85fdfc0e35a04b341c..9f6302eaba0c6ab14ceae154cc4ebc6580db473a 100644 (file)
--- a/kernel/config-arm32-generic
+++ b/kernel/config-arm32-generic
@@ -23,6 +23,8 @@ CONFIG_KERNEL_XZ=y
 # RCU Subsystem
 #
 CONFIG_CONTEXT_TRACKING_FORCE=y
+CONFIG_NMI_LOG_BUF_SHIFT=13
+CONFIG_PRINTK_NMI=y
 
 #
 # Kernel Performance Events And Counters
@@ -140,6 +142,7 @@ CONFIG_SOC_VF610=y
 CONFIG_VF_USE_ARM_GLOBAL_TIMER=y
 # CONFIG_VF_USE_PIT_TIMER is not set
 CONFIG_ARCH_MEDIATEK=y
+# CONFIG_MACH_MT2701 is not set
 CONFIG_MACH_MT6589=y
 CONFIG_MACH_MT6592=y
 CONFIG_MACH_MT7623=y
@@ -191,6 +194,7 @@ CONFIG_MACH_OMAP3517EVM=y
 CONFIG_MACH_OMAP3_PANDORA=y
 CONFIG_MACH_NOKIA_RX51=y
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
+CONFIG_OMAP5_ERRATA_801819=y
 # CONFIG_ARCH_MMP is not set
 CONFIG_ARCH_QCOM=y
 # CONFIG_ARCH_MSM8X60 is not set
@@ -323,7 +327,7 @@ CONFIG_ARM_HEAVY_MB=y
 CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
 CONFIG_DEBUG_ALIGN_RODATA=y
 CONFIG_MULTI_IRQ_HANDLER=y
-# CONFIG_ARM_ERRATA_430973 is not set
+CONFIG_ARM_ERRATA_430973=y
 CONFIG_ARM_ERRATA_643719=y
 CONFIG_ARM_ERRATA_720789=y
 CONFIG_ARM_ERRATA_754322=y
@@ -413,7 +417,6 @@ CONFIG_AUTO_ZRELADDR=y
 # CONFIG_ARM_VEXPRESS_SPC_CPUFREQ is not set
 CONFIG_ARM_EXYNOS5440_CPUFREQ=y
 CONFIG_ARM_HIGHBANK_CPUFREQ=m
-CONFIG_ARM_HISI_ACPU_CPUFREQ=m
 CONFIG_ARM_IMX6Q_CPUFREQ=m
 CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
 CONFIG_ARM_STI_CPUFREQ=m
@@ -441,10 +444,13 @@ CONFIG_NEON=y
 #
 # Power management options
 #
-# CONFIG_HIBERNATION is not set
 CONFIG_APM_EMULATION=y
 CONFIG_ARM_CPU_SUSPEND=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+
+#
+# Classification
+#
+# CONFIG_QRTR is not set
 
 #
 # Device Drivers
@@ -599,6 +605,7 @@ CONFIG_SERIAL_IMX=m
 # CONFIG_SERIAL_VT8500 is not set
 CONFIG_SERIAL_OMAP=m
 CONFIG_SERIAL_BCM63XX=m
+# CONFIG_SERIAL_MPS2_UART is not set
 CONFIG_SERIAL_ST_ASC=m
 CONFIG_SERIAL_STM32=m
 CONFIG_SERIAL_MCTRL_GPIO=m
@@ -607,6 +614,7 @@ CONFIG_HW_RANDOM_IPROC_RNG200=m
 CONFIG_HW_RANDOM_OMAP=y
 CONFIG_HW_RANDOM_OMAP3_ROM=y
 CONFIG_HW_RANDOM_EXYNOS=y
+CONFIG_HW_RANDOM_HISI=y
 CONFIG_HW_RANDOM_MSM=m
 CONFIG_HW_RANDOM_ST=m
 CONFIG_NVRAM=y
@@ -652,7 +660,6 @@ CONFIG_SPMI_MSM_PMIC_ARB=m
 # HSI controllers
 #
 CONFIG_OMAP_SSI=m
-CONFIG_OMAP_SSI_PORT=m
 
 #
 # PPS support
@@ -687,6 +694,7 @@ CONFIG_PINCTRL_ST=y
 # CONFIG_PINCTRL_PALMAS is not set
 CONFIG_PINCTRL_ZYNQ=y
 CONFIG_PINCTRL_IPROC_GPIO=y
+CONFIG_PINCTRL_NS2_MUX=y
 CONFIG_PINCTRL_BERLIN=y
 # CONFIG_PINCTRL_BERLIN_BG2 is not set
 # CONFIG_PINCTRL_BERLIN_BG2CD is not set
@@ -761,6 +769,7 @@ CONFIG_GPIO_BRCMSTB=m
 # CONFIG_GPIO_MPC8XXX is not set
 CONFIG_GPIO_MXC=y
 CONFIG_GPIO_OMAP=y
+CONFIG_GPIO_TEGRA=y
 CONFIG_GPIO_VF610=y
 # CONFIG_GPIO_XILINX is not set
 # CONFIG_GPIO_ZEVIO is not set
@@ -786,8 +795,11 @@ CONFIG_POWER_RESET_KEYSTONE=y
 # CONFIG_HISI_THERMAL is not set
 CONFIG_ROCKCHIP_THERMAL=m
 CONFIG_DB8500_THERMAL=y
-CONFIG_TEGRA_SOCTHERM=m
 CONFIG_DB8500_CPUFREQ_COOLING=y
+
+#
+# ACPI INT340X thermal drivers
+#
 CONFIG_MTK_THERMAL=m
 
 #
@@ -807,6 +819,11 @@ CONFIG_ST_THERMAL=m
 CONFIG_ST_THERMAL_SYSCFG=m
 CONFIG_ST_THERMAL_MEMMAP=m
 
+#
+# NVIDIA Tegra thermal drivers
+#
+CONFIG_TEGRA_SOCTHERM=m
+
 #
 # Watchdog Device Drivers
 #
@@ -835,8 +852,8 @@ CONFIG_SSB_HOST_SOC=y
 #
 CONFIG_MFD_ATMEL_HLCDC=m
 CONFIG_MFD_AXP20X_RSB=m
-# CONFIG_MFD_CROS_EC is not set
 # CONFIG_MFD_ASIC3 is not set
+CONFIG_MFD_HI655X_PMIC=m
 # CONFIG_HTC_EGPIO is not set
 CONFIG_MFD_PM8XXX=m
 CONFIG_MFD_PM8921_CORE=m
@@ -861,6 +878,7 @@ CONFIG_REGULATOR_88PM8607=y
 CONFIG_REGULATOR_DBX500_PRCMU=y
 CONFIG_REGULATOR_DB8500_PRCMU=y
 CONFIG_REGULATOR_GPIO=y
+CONFIG_REGULATOR_HI655X=m
 CONFIG_REGULATOR_LP872X=y
 CONFIG_REGULATOR_LP8788=y
 CONFIG_REGULATOR_PBIAS=m
@@ -935,11 +953,13 @@ CONFIG_DRM_EXYNOS_IPP=y
 # CONFIG_DRM_EXYNOS_ROTATOR is not set
 CONFIG_DRM_EXYNOS_GSC=y
 CONFIG_DRM_ROCKCHIP=m
+CONFIG_ROCKCHIP_ANALOGIX_DP=m
 CONFIG_ROCKCHIP_DW_HDMI=m
 CONFIG_ROCKCHIP_DW_MIPI_DSI=m
 CONFIG_ROCKCHIP_INNO_HDMI=m
 CONFIG_DRM_ARMADA=m
 CONFIG_DRM_ATMEL_HLCDC=m
+CONFIG_DRM_SUN4I=m
 CONFIG_DRM_OMAP=m
 CONFIG_DRM_OMAP_NUM_CRTCS=1
 CONFIG_OMAP2_DSS_INIT=y
@@ -971,6 +991,7 @@ CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
 # CONFIG_DRM_TILCDC is not set
 CONFIG_DRM_MSM=m
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set
+CONFIG_DRM_MSM_HDMI_HDCP=y
 CONFIG_DRM_MSM_DSI=y
 CONFIG_DRM_MSM_DSI_PLL=y
 CONFIG_DRM_MSM_DSI_28NM_PHY=y
@@ -985,10 +1006,12 @@ CONFIG_DRM_TEGRA=m
 #
 CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
+CONFIG_DRM_ANALOGIX_DP=m
 # CONFIG_DRM_STI is not set
 # CONFIG_DRM_IMX is not set
 CONFIG_DRM_ETNAVIV=m
 # CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set
+CONFIG_DRM_MEDIATEK=m
 
 #
 # Frame buffer hardware drivers
@@ -1079,6 +1102,7 @@ CONFIG_SND_SOC_XTFPGA_I2S=m
 # CODEC drivers
 #
 CONFIG_SND_SOC_WM_HUBS=m
+CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_MAX98090=m
 CONFIG_SND_SOC_MAX98095=m
@@ -1092,6 +1116,7 @@ CONFIG_SND_SOC_WM8994=m
 # USB Host Controller Drivers
 #
 CONFIG_USB_XHCI_MTK=m
+CONFIG_USB_XHCI_TEGRA=m
 CONFIG_USB_EHCI_MXC=y
 CONFIG_USB_EHCI_HCD_OMAP=y
 CONFIG_USB_EHCI_HCD_STI=m
@@ -1213,7 +1238,6 @@ CONFIG_NBPFAXI_DMA=m
 # CONFIG_TEGRA20_APB_DMA is not set
 # CONFIG_TI_CPPI41 is not set
 # CONFIG_TI_EDMA is not set
-CONFIG_XILINX_VDMA=m
 # CONFIG_QCOM_BAM_DMA is not set
 
 #
@@ -1228,7 +1252,9 @@ CONFIG_CHROME_PLATFORMS=y
 CONFIG_COMMON_CLK_KEYSTONE=y
 CONFIG_CLK_BCM_63XX=y
 CONFIG_COMMON_CLK_IPROC=y
+CONFIG_COMMON_CLK_HI3519=y
 CONFIG_COMMON_CLK_HI6220=y
+CONFIG_RESET_HISI=y
 CONFIG_STUB_CLK_HI6220=y
 CONFIG_QCOM_GDSC=y
 CONFIG_COMMON_CLK_QCOM=m
@@ -1343,11 +1369,18 @@ CONFIG_ARCH_TEGRA_124_SOC=y
 CONFIG_KEYSTONE_NAVIGATOR_DMA=m
 CONFIG_WKUP_M3_IPC=m
 
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PASSIVE=y
+
 #
 # DEVFREQ Drivers
 #
-CONFIG_ARM_EXYNOS5_BUS_DEVFREQ=m
+CONFIG_ARM_EXYNOS_BUS_DEVFREQ=y
 CONFIG_ARM_TEGRA_DEVFREQ=m
+CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=y
 CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
 
 #
@@ -1359,6 +1392,8 @@ CONFIG_OMAP_GPMC=y
 # CONFIG_OMAP_GPMC_DEBUG is not set
 CONFIG_TEGRA20_MC=y
 CONFIG_MTK_SMI=y
+CONFIG_SAMSUNG_MC=y
+CONFIG_EXYNOS_SROM=y
 CONFIG_TEGRA_MC=y
 CONFIG_TEGRA124_EMC=y
 
@@ -1407,6 +1442,7 @@ CONFIG_COMMON_RESET_HI6220=m
 #
 # PHY Subsystem
 #
+CONFIG_PHY_BCM_NS_USB2=m
 CONFIG_PHY_BERLIN_USB=m
 CONFIG_PHY_BERLIN_SATA=m
 CONFIG_PHY_DM816X_USB=m
@@ -1433,7 +1469,8 @@ CONFIG_PHY_ROCKCHIP_DP=m
 CONFIG_PHY_STIH407_USB=m
 CONFIG_PHY_STIH41X_USB=m
 CONFIG_PHY_QCOM_UFS=m
-CONFIG_PHY_BRCMSTB_SATA=m
+CONFIG_PHY_BRCM_SATA=y
+CONFIG_PHY_TEGRA_XUSB=m
 
 #
 # Android
@@ -1507,6 +1544,7 @@ CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
 CONFIG_CRYPTO_DEV_OMAP_DES=m
 CONFIG_CRYPTO_DEV_SAHARA=m
+CONFIG_CRYPTO_DEV_MXC_SCC=m
 CONFIG_CRYPTO_DEV_S5P=m
 # CONFIG_CRYPTO_DEV_UX500 is not set
 CONFIG_CRYPTO_DEV_MXS_DCP=m

diff --git a/kernel/config-arm64-generic b/kernel/config-arm64-generic
index d133512601ed93be8d4a0872791af4b184813dac..b78a1d9c513409cbc90830cd9e4016ee9b73a8a7 100644 (file)
--- a/kernel/config-arm64-generic
+++ b/kernel/config-arm64-generic
@@ -1,6 +1,8 @@
 CONFIG_ARM64=y
 CONFIG_64BIT=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARM64_PAGE_SHIFT=16
+CONFIG_ARM64_CONT_SHIFT=5
 CONFIG_ARCH_MMAP_RND_BITS_MIN=14
 CONFIG_ARCH_MMAP_RND_BITS_MAX=27
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=7
@@ -21,6 +23,8 @@ CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
 # RCU Subsystem
 #
 # CONFIG_CONTEXT_TRACKING_FORCE is not set
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+# CONFIG_NUMA_BALANCING is not set
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 
 #
@@ -50,6 +54,7 @@ CONFIG_PREEMPT_NOTIFIERS=y
 # CONFIG_ARCH_BERLIN is not set
 # CONFIG_ARCH_EXYNOS is not set
 # CONFIG_ARCH_LAYERSCAPE is not set
+# CONFIG_ARCH_LG1K is not set
 # CONFIG_ARCH_HISI is not set
 # CONFIG_ARCH_MEDIATEK is not set
 # CONFIG_ARCH_QCOM is not set
@@ -91,6 +96,7 @@ CONFIG_ARM64_ERRATUM_834220=y
 CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_CAVIUM_ERRATUM_22375=y
+CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
 CONFIG_CAVIUM_ERRATUM_27456=y
 # CONFIG_ARM64_4K_PAGES is not set
@@ -100,6 +106,9 @@ CONFIG_ARM64_VA_BITS_42=y
 # CONFIG_ARM64_VA_BITS_48 is not set
 CONFIG_ARM64_VA_BITS=42
 CONFIG_NR_CPUS=64
+CONFIG_NUMA=y
+CONFIG_NODES_SHIFT=2
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_250 is not set
 CONFIG_HZ_300=y
@@ -114,6 +123,7 @@ CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
+CONFIG_NEED_MULTIPLE_NODES=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SPARSEMEM_VMEMMAP=y
@@ -180,6 +190,7 @@ CONFIG_GENERIC_CPU_AUTOPROBE=y
 #
 # Bus devices
 #
+CONFIG_OF_NUMA=y
 CONFIG_PNP=y
 # CONFIG_PNP_DEBUG_MESSAGES is not set
 
@@ -252,7 +263,6 @@ CONFIG_INPUT_MATRIXKMAP=m
 # Serial drivers
 #
 CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_FINTEK=m
 
 #
 # Non-8250 serial port support
@@ -348,6 +358,17 @@ CONFIG_ARM_SBSA_WATCHDOG=m
 # CONFIG_IR_FINTEK is not set
 # CONFIG_IR_NUVOTON is not set
 
+#
+# Display Interface Bridges
+#
+CONFIG_DRM_HISI_KIRIN=m
+CONFIG_HISI_KIRIN_DW_DSI=m
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_EFI is not set
+
 #
 # Console display driver support
 #
@@ -366,14 +387,14 @@ CONFIG_DUMMY_CONSOLE_ROWS=25
 CONFIG_MUSB_PIO_ONLY=y
 
 #
-# MMC/SD/SDIO Host Controller Drivers
+# USB Miscellaneous drivers
 #
-CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_UCSI=m
 
 #
-# LED drivers
+# MMC/SD/SDIO Host Controller Drivers
 #
-CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_MMC_SDHCI_ACPI=m
 
 #
 # iptables trigger is under Netfilter config (LED target)
@@ -435,6 +456,12 @@ CONFIG_ARM_SMMU_V3=y
 #
 # CONFIG_SUNXI_SRAM is not set
 
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
+CONFIG_DEVFREQ_GOV_PASSIVE=m
+
 #
 # Light sensors
 #
@@ -476,6 +503,8 @@ CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI_PARAMS_FROM_FDT=y
 CONFIG_EFI_RUNTIME_WRAPPERS=y
 CONFIG_EFI_ARMSTUB=y
+# CONFIG_EFI_BOOTLOADER_CONTROL is not set
+# CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_GENERIC_GSI=y
 CONFIG_ACPI_CCA_REQUIRED=y
@@ -517,6 +546,7 @@ CONFIG_KVM_ARM_VGIC_V3=y
 CONFIG_KVM=y
 CONFIG_KVM_ARM_HOST=y
 CONFIG_KVM_ARM_PMU=y
+CONFIG_KVM_NEW_VGIC=y
 
 #
 # Compile-time checks and compiler options
@@ -535,6 +565,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 # CONFIG_ARM64_PTDUMP is not set
 # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
+# CONFIG_DEBUG_ALIGN_RODATA is not set
 
 #
 # Random Number Generation

diff --git a/kernel/config-generic b/kernel/config-generic
index 4c51645aaa05345ef31579fdfe7462f9e1375b0b..6f6bd6aa65475e9acc3769464c2fffa9d14da582 100644 (file)
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -9,6 +9,7 @@ CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_DEBUG_RODATA=y
@@ -130,6 +131,7 @@ CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
@@ -204,7 +206,10 @@ CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+# CONFIG_HAVE_ARCH_HASH is not set
+# CONFIG_ISA_BUS_API is not set
 CONFIG_OLD_SIGSUSPEND3=y
+# CONFIG_CPU_NO_EFFICIENT_FFS is not set
 
 #
 # GCOV-based kernel profiling
@@ -221,6 +226,7 @@ CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 # CONFIG_MODULE_SIG is not set
 # CONFIG_MODULE_COMPRESS is not set
+# CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
 CONFIG_BLK_DEV_BSG=y
@@ -293,6 +299,10 @@ CONFIG_SCHED_MC=y
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
+
+#
+# Performance monitoring
+#
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
 # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
@@ -301,7 +311,6 @@ CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
-CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
@@ -313,6 +322,7 @@ CONFIG_CMA=y
 CONFIG_CMA_AREAS=7
 CONFIG_ZPOOL=m
 # CONFIG_ZBUD is not set
+# CONFIG_Z3FOLD is not set
 # CONFIG_ZSMALLOC is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_IDLE_PAGE_TRACKING=y
@@ -327,6 +337,7 @@ CONFIG_HOTPLUG_CPU=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_SUSPEND_SKIP_SYNC is not set
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_AUTOSLEEP is not set
@@ -344,22 +355,26 @@ CONFIG_PM_GENERIC_DOMAINS_OF=y
 # CPU Frequency scaling
 #
 CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_ATTR_SET=y
 CONFIG_CPU_FREQ_GOV_COMMON=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=m
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=m
 
 #
 # CPU frequency scaling drivers
 #
 CONFIG_CPUFREQ_DT=m
+CONFIG_CPUFREQ_DT_PLATDEV=y
 
 #
 # shared options
@@ -388,6 +403,7 @@ CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
+CONFIG_PCIE_DPC=m
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
 CONFIG_HOTPLUG_PCI=y
@@ -509,6 +525,8 @@ CONFIG_IPV6_SIT_6RD=y
 CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IPV6_TUNNEL=m
 CONFIG_IPV6_GRE=m
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_FOU_TUNNEL=m
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_SUBTREES=y
 CONFIG_IPV6_MROUTE=y
@@ -811,6 +829,7 @@ CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
 CONFIG_SCTP_COOKIE_HMAC_MD5=y
 CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_INET_SCTP_DIAG=m
 # CONFIG_RDS is not set
 # CONFIG_TIPC is not set
 CONFIG_ATM=m
@@ -833,7 +852,6 @@ CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=y
 CONFIG_NET_DSA_HWMON=y
 CONFIG_NET_DSA_TAG_BRCM=y
-CONFIG_NET_DSA_TAG_DSA=y
 CONFIG_NET_DSA_TAG_EDSA=y
 CONFIG_NET_DSA_TAG_TRAILER=y
 CONFIG_VLAN_8021Q=y
@@ -1051,7 +1069,6 @@ CONFIG_LWTUNNEL=y
 CONFIG_DST_CACHE=y
 CONFIG_NET_DEVLINK=y
 CONFIG_MAY_USE_DEVLINK=y
-CONFIG_HAVE_BPF_JIT=y
 
 #
 # Device Drivers
@@ -1349,6 +1366,9 @@ CONFIG_ATA_BMDMA=y
 # SATA SFF controllers with BMDMA
 #
 CONFIG_ATA_PIIX=m
+CONFIG_SATA_DWC=m
+# CONFIG_SATA_DWC_OLD_DMA is not set
+# CONFIG_SATA_DWC_DEBUG is not set
 CONFIG_SATA_MV=m
 CONFIG_SATA_NV=m
 CONFIG_SATA_PROMISE=m
@@ -1476,6 +1496,7 @@ CONFIG_MACVTAP=m
 CONFIG_IPVLAN=m
 CONFIG_VXLAN=m
 # CONFIG_GENEVE is not set
+# CONFIG_GTP is not set
 # CONFIG_MACSEC is not set
 CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
@@ -1506,13 +1527,8 @@ CONFIG_VHOST=m
 #
 # Distributed Switch Architecture drivers
 #
-CONFIG_NET_DSA_MV88E6XXX=y
 CONFIG_NET_DSA_MV88E6060=y
-CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
-CONFIG_NET_DSA_MV88E6131=y
-CONFIG_NET_DSA_MV88E6123=m
-CONFIG_NET_DSA_MV88E6171=m
-CONFIG_NET_DSA_MV88E6352=m
+CONFIG_NET_DSA_MV88E6XXX=y
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
@@ -1649,6 +1665,7 @@ CONFIG_QLGE=m
 CONFIG_NETXEN_NIC=m
 CONFIG_QED=m
 CONFIG_QEDE=m
+CONFIG_QEDE_VXLAN=y
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_8139CP=m
@@ -2251,7 +2268,6 @@ CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_NONSTANDARD=y
 # CONFIG_MOXA_INTELLIO is not set
@@ -2269,6 +2285,7 @@ CONFIG_DEVKMEM=y
 CONFIG_SERIAL_EARLYCON=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
+# CONFIG_SERIAL_8250_FINTEK is not set
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DMA=y
 CONFIG_SERIAL_8250_PCI=y
@@ -2281,7 +2298,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_DW=m
 CONFIG_SERIAL_8250_RT288X=y
-CONFIG_SERIAL_8250_MID=m
 CONFIG_SERIAL_8250_MOXA=m
 
 #
@@ -2297,8 +2313,6 @@ CONFIG_SERIAL_SC16IS7XX_I2C=y
 # CONFIG_SERIAL_ALTERA_UART is not set
 CONFIG_SERIAL_FSL_LPUART=m
 CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
-CONFIG_SERIAL_MVEBU_UART=y
-CONFIG_SERIAL_MVEBU_CONSOLE=y
 # CONFIG_TTY_PRINTK is not set
 CONFIG_HVC_DRIVER=y
 CONFIG_VIRTIO_CONSOLE=m
@@ -2723,7 +2737,12 @@ CONFIG_CLOCK_THERMAL=y
 CONFIG_DEVFREQ_THERMAL=y
 CONFIG_THERMAL_EMULATION=y
 CONFIG_IMX_THERMAL=m
+
+#
+# ACPI INT340X thermal drivers
+#
 CONFIG_QCOM_SPMI_TEMP_ALARM=m
+CONFIG_GENERIC_ADC_THERMAL=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_NOWAYOUT=y
@@ -2808,6 +2827,7 @@ CONFIG_MFD_ATMEL_FLEXCOM=m
 CONFIG_MFD_BCM590XX=m
 CONFIG_MFD_AXP20X=m
 CONFIG_MFD_AXP20X_I2C=m
+# CONFIG_MFD_CROS_EC is not set
 CONFIG_PMIC_DA903X=y
 CONFIG_PMIC_DA9052=y
 CONFIG_MFD_DA9052_I2C=y
@@ -2828,6 +2848,7 @@ CONFIG_MFD_88PM800=m
 CONFIG_MFD_88PM805=m
 CONFIG_MFD_88PM860X=y
 CONFIG_MFD_MAX14577=y
+CONFIG_MFD_MAX77620=y
 CONFIG_MFD_MAX77686=y
 CONFIG_MFD_MAX77693=y
 CONFIG_MFD_MAX77843=y
@@ -2919,6 +2940,7 @@ CONFIG_REGULATOR_LP8755=m
 CONFIG_REGULATOR_LTC3589=m
 CONFIG_REGULATOR_MAX14577=m
 CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX77620=m
 CONFIG_REGULATOR_MAX8649=m
 CONFIG_REGULATOR_MAX8660=m
 CONFIG_REGULATOR_MAX8907=m
@@ -2935,6 +2957,7 @@ CONFIG_REGULATOR_MT6397=m
 CONFIG_REGULATOR_PALMAS=m
 CONFIG_REGULATOR_PFUZE100=m
 CONFIG_REGULATOR_PV88060=m
+CONFIG_REGULATOR_PV88080=m
 CONFIG_REGULATOR_PV88090=m
 CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_REGULATOR_RC5T583=m
@@ -3185,6 +3208,7 @@ CONFIG_MEDIA_PCI_SUPPORT=y
 #
 # CONFIG_VIDEO_SOLO6X10 is not set
 # CONFIG_VIDEO_TW68 is not set
+CONFIG_VIDEO_TW686X=m
 
 #
 # Media capture/analog TV support
@@ -3474,6 +3498,8 @@ CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_TTM=m
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
 
 #
 # I2C encoder or helper chips
@@ -3488,6 +3514,7 @@ CONFIG_DRM_RADEON=m
 CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AMDGPU_CIK=y
 CONFIG_DRM_AMDGPU_USERPTR=y
+# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMD_POWERPLAY=y
 
 #
@@ -3498,6 +3525,10 @@ CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+
+#
+# drm/i915 Debugging
+#
 CONFIG_DRM_MGA=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
@@ -3524,8 +3555,10 @@ CONFIG_DRM_BRIDGE=y
 #
 # Display Interface Bridges
 #
+CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_NXP_PTN3460=m
 CONFIG_DRM_PARADE_PS8622=m
+CONFIG_DRM_ARCPGU=m
 
 #
 # Frame buffer Devices
@@ -3799,6 +3832,7 @@ CONFIG_HID_A4TECH=y
 # CONFIG_HID_ACRUX is not set
 CONFIG_HID_APPLE=y
 # CONFIG_HID_APPLEIR is not set
+CONFIG_HID_ASUS=m
 CONFIG_HID_AUREAL=m
 CONFIG_HID_BELKIN=y
 # CONFIG_HID_BETOP_FF is not set
@@ -4114,6 +4148,8 @@ CONFIG_USB_LED_TRIG=y
 # CONFIG_UWB is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
+CONFIG_PWRSEQ_EMMC=y
+CONFIG_PWRSEQ_SIMPLE=y
 
 #
 # MMC/SD/SDIO Card Drivers
@@ -4225,6 +4261,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 #
 CONFIG_LEDS_TRIGGER_TRANSIENT=m
 CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC_SUPPORT=y
@@ -4291,8 +4328,6 @@ CONFIG_RTC_DRV_RX8010=m
 CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_RX8025=m
 CONFIG_RTC_DRV_EM3027=m
-CONFIG_RTC_DRV_RV3029C2=m
-CONFIG_RTC_DRV_RV3029_HWMON=y
 CONFIG_RTC_DRV_RV8803=m
 CONFIG_RTC_DRV_S5M=m
 
@@ -4306,6 +4341,8 @@ CONFIG_RTC_I2C_AND_SPI=y
 #
 CONFIG_RTC_DRV_DS3232=m
 CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_RV3029_HWMON=y
 
 #
 # Platform RTC drivers
@@ -4361,13 +4398,17 @@ CONFIG_FSL_EDMA=m
 CONFIG_INTEL_IDMA64=m
 CONFIG_QCOM_HIDMA_MGMT=m
 CONFIG_QCOM_HIDMA=m
-CONFIG_HSU_DMA=m
 
 #
 # DMA Clients
 #
 CONFIG_ASYNC_TX_DMA=y
 # CONFIG_DMATEST is not set
+
+#
+# DMABUF options
+#
+# CONFIG_SYNC_FILE is not set
 # CONFIG_AUXDISPLAY is not set
 CONFIG_UIO=m
 # CONFIG_UIO_CIF is not set
@@ -4414,6 +4455,8 @@ CONFIG_CLK_TWL6040=m
 # CONFIG_COMMON_CLK_NXP is not set
 CONFIG_COMMON_CLK_PALMAS=m
 # CONFIG_COMMON_CLK_PXA is not set
+# CONFIG_COMMON_CLK_PIC32 is not set
+# CONFIG_COMMON_CLK_OXNAS is not set
 
 #
 # Hardware Spinlock drivers
@@ -4457,7 +4500,6 @@ CONFIG_PM_DEVFREQ=y
 #
 # DEVFREQ Governors
 #
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
 CONFIG_DEVFREQ_GOV_PERFORMANCE=m
 CONFIG_DEVFREQ_GOV_POWERSAVE=m
 CONFIG_DEVFREQ_GOV_USERSPACE=m
@@ -4560,6 +4602,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_AD5064 is not set
 # CONFIG_AD5380 is not set
 # CONFIG_AD5446 is not set
+# CONFIG_AD5593R is not set
 # CONFIG_M62332 is not set
 # CONFIG_MAX517 is not set
 CONFIG_MAX5821=m
@@ -4604,6 +4647,7 @@ CONFIG_MAX5821=m
 #
 # Humidity sensors
 #
+# CONFIG_AM2315 is not set
 CONFIG_DHT11=m
 # CONFIG_HDC100X is not set
 # CONFIG_HTU21 is not set
@@ -4613,6 +4657,7 @@ CONFIG_DHT11=m
 #
 # Inertial measurement units
 #
+# CONFIG_BMI160_I2C is not set
 # CONFIG_KMX61 is not set
 # CONFIG_INV_MPU6050_I2C is not set
 
@@ -4624,6 +4669,7 @@ CONFIG_DHT11=m
 # CONFIG_APDS9300 is not set
 # CONFIG_APDS9960 is not set
 # CONFIG_BH1750 is not set
+# CONFIG_BH1780 is not set
 CONFIG_CM32181=m
 # CONFIG_CM3232 is not set
 # CONFIG_CM3323 is not set
@@ -4636,6 +4682,7 @@ CONFIG_CM32181=m
 # CONFIG_RPR0521 is not set
 # CONFIG_SENSORS_LM3533 is not set
 # CONFIG_LTR501 is not set
+# CONFIG_MAX44000 is not set
 # CONFIG_OPT3001 is not set
 # CONFIG_PA12203001 is not set
 # CONFIG_STK3310 is not set
@@ -4645,13 +4692,14 @@ CONFIG_CM32181=m
 # CONFIG_TSL4531 is not set
 # CONFIG_US5182D is not set
 # CONFIG_VCNL4000 is not set
+# CONFIG_VEML6070 is not set
 
 #
 # Magnetometer sensors
 #
 # CONFIG_AK8975 is not set
 # CONFIG_AK09911 is not set
-# CONFIG_BMC150_MAGN is not set
+# CONFIG_BMC150_MAGN_I2C is not set
 # CONFIG_MAG3110 is not set
 # CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
 # CONFIG_MMC35240 is not set
@@ -4674,14 +4722,15 @@ CONFIG_IIO_INTERRUPT_TRIGGER=m
 #
 # Digital potentiometers
 #
+# CONFIG_DS1803 is not set
 # CONFIG_MCP4531 is not set
 # CONFIG_TPL0102 is not set
 
 #
 # Pressure sensors
 #
-# CONFIG_BMP280 is not set
 # CONFIG_HID_SENSOR_PRESS is not set
+# CONFIG_HP03 is not set
 # CONFIG_MPL115_I2C is not set
 CONFIG_MPL3115=m
 # CONFIG_MS5611 is not set
@@ -4689,6 +4738,7 @@ CONFIG_MPL3115=m
 CONFIG_IIO_ST_PRESS=m
 CONFIG_IIO_ST_PRESS_I2C=m
 # CONFIG_T5403 is not set
+# CONFIG_HP206C is not set
 
 #
 # Lightning sensors
@@ -5093,6 +5143,7 @@ CONFIG_DEBUG_LIST=y
 # CONFIG_PROVE_RCU is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_TORTURE_TEST is not set
+# CONFIG_RCU_PERF_TEST is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_EQS_DEBUG is not set
@@ -5154,7 +5205,9 @@ CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_UUID is not set
 # CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_HASH is not set
 # CONFIG_BUILD_DOCSRC is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_TEST_LKM is not set
@@ -5180,6 +5233,7 @@ CONFIG_KEYS=y
 CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_BIG_KEYS is not set
 CONFIG_ENCRYPTED_KEYS=m
+# CONFIG_KEY_DH_OPERATIONS is not set
 CONFIG_SECURITY_DMESG_RESTRICT=y
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
@@ -5197,6 +5251,7 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
+# CONFIG_SECURITY_LOADPIN is not set
 # CONFIG_SECURITY_YAMA is not set
 CONFIG_INTEGRITY=y
 CONFIG_INTEGRITY_SIGNATURE=y
@@ -5347,7 +5402,6 @@ CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
 CONFIG_X509_CERTIFICATE_PARSER=y
 CONFIG_PKCS7_MESSAGE_PARSER=m
-# CONFIG_PKCS7_TEST_KEY is not set
 
 #
 # Certificates for signature checking
@@ -5355,6 +5409,7 @@ CONFIG_PKCS7_MESSAGE_PARSER=m
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
 CONFIG_VIRTUALIZATION=y
 CONFIG_BINARY_PRINTF=y
 
@@ -5438,4 +5493,5 @@ CONFIG_FONT_SUPPORT=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
 # CONFIG_SG_SPLIT is not set
+CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_SG_CHAIN=y

diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index ac109eadf7fac98e7b435a4599c64ad94b047050..ac849db766513cf3e683fb28fdf420e84358f983 100644 (file)
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -2,7 +2,6 @@ CONFIG_64BIT=y
 CONFIG_X86_64=y
 CONFIG_X86=y
 CONFIG_INSTRUCTION_DECODER=y
-CONFIG_PERF_EVENTS_INTEL_UNCORE=y
 CONFIG_OUTPUT_FORMAT="elf64-x86-64"
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
 CONFIG_ARCH_MMAP_RND_BITS_MIN=28
@@ -16,7 +15,6 @@ CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ZONE_DMA32=y
@@ -56,12 +54,14 @@ CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_CONTEXT_TRACKING_FORCE=y
 # CONFIG_RCU_NOCB_CPU_NONE is not set
 CONFIG_RCU_NOCB_CPU_ALL=y
+CONFIG_NMI_LOG_BUF_SHIFT=13
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 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
 
 #
@@ -153,6 +153,14 @@ CONFIG_X86_MCE_AMD=y
 CONFIG_X86_MCE_THRESHOLD=y
 # CONFIG_X86_MCE_INJECT is not set
 CONFIG_X86_THERMAL_VECTOR=y
+
+#
+# Performance monitoring
+#
+CONFIG_PERF_EVENTS_INTEL_UNCORE=y
+CONFIG_PERF_EVENTS_INTEL_RAPL=y
+CONFIG_PERF_EVENTS_INTEL_CSTATE=y
+CONFIG_PERF_EVENTS_AMD_POWER=m
 # CONFIG_VM86 is not set
 CONFIG_X86_VSYSCALL_EMULATION=y
 CONFIG_I8K=m
@@ -160,7 +168,6 @@ CONFIG_MICROCODE=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_PERF_EVENTS_AMD_POWER=m
 # CONFIG_X86_MSR is not set
 CONFIG_X86_CPUID=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
@@ -229,7 +236,6 @@ CONFIG_CRASH_DUMP=y
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_RELOCATABLE=y
 CONFIG_RANDOMIZE_BASE=y
-CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000
 CONFIG_X86_NEED_RELOCS=y
 CONFIG_PHYSICAL_ALIGN=0x1000000
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
@@ -247,7 +253,6 @@ CONFIG_USE_PERCPU_NUMA_NODE_ID=y
 #
 # Power management and ACPI options
 #
-# CONFIG_HIBERNATION is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
 CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
@@ -272,7 +277,7 @@ CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
 CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_NUMA=y
 # CONFIG_ACPI_CUSTOM_DSDT is not set
-CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
+CONFIG_ACPI_TABLE_UPGRADE=y
 # CONFIG_ACPI_DEBUG is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_X86_PM_TIMER=y
@@ -355,6 +360,7 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 #
 # PCI host controller drivers
 #
+# CONFIG_ISA_BUS is not set
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
@@ -584,6 +590,7 @@ CONFIG_NFP_NETVF=m
 # CONFIG_NFP_NET_DEBUG is not set
 CONFIG_QLCNIC_SRIOV=y
 CONFIG_QLCNIC_VXLAN=y
+CONFIG_QED_SRIOV=y
 CONFIG_ATP=m
 # CONFIG_8139TOO_PIO is not set
 CONFIG_8139TOO_8129=y
@@ -665,7 +672,7 @@ CONFIG_NOZOMI=m
 #
 CONFIG_SERIAL_8250_PNP=y
 # CONFIG_SERIAL_8250_FSL is not set
-CONFIG_SERIAL_8250_FINTEK=m
+CONFIG_SERIAL_8250_MID=m
 CONFIG_SERIAL_OF_PLATFORM=m
 
 #
@@ -781,14 +788,10 @@ CONFIG_GPIO_XILINX=m
 #
 # Port-mapped I/O GPIO drivers
 #
-CONFIG_GPIO_104_DIO_48E=m
-CONFIG_GPIO_104_IDIO_16=m
-CONFIG_GPIO_104_IDI_48=m
 # CONFIG_GPIO_F7188X is not set
 CONFIG_GPIO_IT87=m
 CONFIG_GPIO_SCH=m
 # CONFIG_GPIO_SCH311X is not set
-CONFIG_GPIO_WS16C48=m
 
 #
 # MFD GPIO expanders
@@ -844,8 +847,13 @@ CONFIG_INTEL_POWERCLAMP=m
 CONFIG_X86_PKG_TEMP_THERMAL=m
 CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
 CONFIG_INTEL_SOC_DTS_THERMAL=m
+
+#
+# ACPI INT340X thermal drivers
+#
 CONFIG_INT340X_THERMAL=m
 CONFIG_ACPI_THERMAL_REL=m
+CONFIG_INT3406_THERMAL=m
 CONFIG_INTEL_PCH_THERMAL=m
 
 #
@@ -854,7 +862,6 @@ CONFIG_INTEL_PCH_THERMAL=m
 # CONFIG_ACQUIRE_WDT is not set
 # CONFIG_ADVANTECH_WDT is not set
 CONFIG_ALIM1535_WDT=m
-CONFIG_EBC_C384_WDT=m
 CONFIG_F71808E_WDT=m
 CONFIG_SP5100_TCO=m
 CONFIG_SBC_FITPC2_WATCHDOG=m
@@ -895,7 +902,6 @@ CONFIG_WDTPCI=m
 # Multifunction device drivers
 #
 CONFIG_MFD_ATMEL_HLCDC=m
-# CONFIG_MFD_CROS_EC is not set
 CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
 CONFIG_LPC_ICH=m
 CONFIG_MFD_INTEL_LPSS=m
@@ -1081,6 +1087,12 @@ CONFIG_DRM_I810=m
 CONFIG_DRM_I915=m
 # CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
 CONFIG_DRM_I915_USERPTR=y
+
+#
+# drm/i915 Debugging
+#
+# CONFIG_DRM_I915_WERROR is not set
+# CONFIG_DRM_I915_DEBUG is not set
 CONFIG_DRM_SIS=m
 CONFIG_DRM_VMWGFX=m
 # CONFIG_DRM_VMWGFX_FBCON is not set
@@ -1147,6 +1159,11 @@ CONFIG_MUSB_PIO_ONLY=y
 CONFIG_USB_USS720=m
 CONFIG_USB_SERIAL_MOS7715_PARPORT=y
 
+#
+# USB Miscellaneous drivers
+#
+CONFIG_UCSI=m
+
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
@@ -1206,11 +1223,16 @@ CONFIG_INTEL_MIC_X100_DMA=m
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
+CONFIG_HSU_DMA=m
 
 #
 # DMA Clients
 #
 CONFIG_DMA_ENGINE_RAID=y
+
+#
+# DMABUF options
+#
 CONFIG_DCA=m
 CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
@@ -1270,6 +1292,7 @@ CONFIG_TOSHIBA_WMI=m
 CONFIG_ACPI_CMPC=m
 CONFIG_INTEL_HID_EVENT=m
 CONFIG_INTEL_IPS=m
+# CONFIG_INTEL_PMC_CORE is not set
 # CONFIG_IBM_RTL is not set
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_MXM_WMI=m
@@ -1286,6 +1309,7 @@ CONFIG_INTEL_TELEMETRY=m
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
 # CONFIG_CHROMEOS_PSTORE is not set
+# CONFIG_CROS_KBD_LED_BACKLIGHT is not set
 
 #
 # Common Clock Framework
@@ -1305,7 +1329,6 @@ CONFIG_PCC=y
 # Generic IOMMU Pagetable Support
 #
 CONFIG_AMD_IOMMU=y
-CONFIG_AMD_IOMMU_STATS=y
 CONFIG_AMD_IOMMU_V2=m
 CONFIG_DMAR_TABLE=y
 CONFIG_INTEL_IOMMU=y
@@ -1319,6 +1342,12 @@ CONFIG_IRQ_REMAP=y
 #
 # CONFIG_SUNXI_SRAM is not set
 
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
+CONFIG_DEVFREQ_GOV_PASSIVE=m
+
 #
 # Analog to digital converters
 #
@@ -1345,7 +1374,7 @@ CONFIG_TWL6030_GPADC=m
 #
 # Performance monitor support
 #
-# CONFIG_AMD_MCE_INJ is not set
+# CONFIG_MCE_AMD_INJ is not set
 
 #
 # Android
@@ -1356,6 +1385,7 @@ CONFIG_ND_BLK=m
 CONFIG_ND_CLAIM=y
 CONFIG_ND_BTT=m
 CONFIG_BTT=y
+# CONFIG_DEV_DAX is not set
 
 #
 # Firmware Drivers
@@ -1383,6 +1413,8 @@ CONFIG_EFI_VARS_PSTORE=y
 # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
 # CONFIG_EFI_FAKE_MEMMAP is not set
 CONFIG_EFI_RUNTIME_WRAPPERS=y
+# CONFIG_EFI_BOOTLOADER_CONTROL is not set
+# CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_UEFI_CPER=y
 
 #
@@ -1433,6 +1465,7 @@ CONFIG_FTRACE_SYSCALLS=y
 # CONFIG_UPROBE_EVENT is not set
 CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 # CONFIG_MMIOTRACE is not set
+# CONFIG_HIST_TRIGGERS is not set
 
 #
 # Runtime Testing
@@ -1562,6 +1595,7 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
+CONFIG_RADIX_TREE_MULTIORDER=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_UCS2_STRING=y
 CONFIG_ARCH_HAS_PMEM_API=y

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 51d41037c9133a5e963b727862f5edf4eb262d55..8f5de9ff5c8f9efa4dbb5dcf5a241848994590ba 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = kernel
-version    = 4.6.7
-release    = 4
+version    = 4.7.9
+release    = 1
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>