diff --git a/config-arm-generic b/config-arm-generic
index f52f5347e..5a322f8b0 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -66,9 +66,10 @@ CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GLOBAL_TIMER=y
 CONFIG_ARM_SMMU=y
 CONFIG_MMC_ARMMMCI=y
+CONFIG_COMMON_CLK_SCPI=m
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_SERIO_AMBAKMI=y
+CONFIG_SERIO_AMBAKMI=m
 CONFIG_FB_ARMCLCD=y
 CONFIG_RTC_DRV_PL031=y
 CONFIG_PL330_DMA=m
@@ -89,11 +90,6 @@ CONFIG_CRYPTO_SHA1_ARM_NEON=y
 CONFIG_CRYPTO_SHA512_ARM=y
 CONFIG_TCG_TIS_I2C_ATMEL=m
 
-# EDAC
-CONFIG_EDAC=y
-CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_LEGACY_SYSFS=y
-
 # Regulators
 CONFIG_REGULATOR=y
 CONFIG_RFKILL_REGULATOR=m
@@ -396,7 +392,6 @@ CONFIG_USB_MUSB_DUAL_ROLE=y
 CONFIG_USB_MUSB_DSPS=m
 # CONFIG_MUSB_PIO_ONLY is not set
 # CONFIG_USB_MUSB_TUSB6010 is not set
-# CONFIG_USB_MUSB_UX500 is not set
 CONFIG_USB_GPIO_VBUS=m
 CONFIG_USB_CONFIGFS=m
 CONFIG_USB_CONFIGFS_ACM=y
@@ -581,13 +576,8 @@ CONFIG_VFIO_PLATFORM=m
 CONFIG_VFIO_AMBA=m
 # CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET is not set
 
-# CONFIG_CRYPTO_TEST is not set
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
 # CONFIG_XEN is not set
-# CONFIG_DRM_RCAR_DU is not set
-# CONFIG_I2C_RCAR is not set
-# CONFIG_DRM_SHMOBILE is not set
-# CONFIG_I2C_SH_MOBILE is not set
 # CONFIG_I2C_NOMADIK is not set
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
 # CONFIG_LOCK_STAT is not set
@@ -597,13 +587,10 @@ CONFIG_VFIO_AMBA=m
 # CONFIG_DRM_ARMADA is not set
 
 # CONFIG_COMMON_CLK_SI570 is not set
-# CONFIG_COMMON_CLK_QCOM is not set
-CONFIG_COMMON_CLK_SCPI=m
 
 # CONFIG_ARM_PTDUMP is not set
 
 # CONFIG_PATA_PLATFORM is not set
-# CONFIG_KEYBOARD_OMAP4 is not set
 # CONFIG_KEYBOARD_BCM is not set
 # CONFIG_PHY_SAMSUNG_USB2 is not set
 # CONFIG_OMAP_GPMC_DEBUG is not set
diff --git a/config-arm64 b/config-arm64
index c1a4bce6a..f6ae174cd 100644
--- a/config-arm64
+++ b/config-arm64
@@ -139,6 +139,7 @@ CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 # APM Xgene
 CONFIG_POWER_RESET_XGENE=y
 CONFIG_COMMON_CLK_XGENE=y
+CONFIG_XGENE_PMU=y
 CONFIG_AHCI_XGENE=y
 CONFIG_PHY_XGENE=y
 CONFIG_NET_XGENE=m
@@ -154,7 +155,6 @@ CONFIG_I2C_XGENE_SLIMPRO=m
 CONFIG_XGENE_SLIMPRO_MBOX=m
 CONFIG_MDIO_XGENE=m
 CONFIG_SENSORS_XGENE=m
-CONFIG_XGENE_PMU=y
 
 # AMD Seattle
 CONFIG_NET_SB1000=y
@@ -231,6 +231,20 @@ CONFIG_MFD_QCOM_RPM=m
 CONFIG_PINCTRL_MSM=y
 CONFIG_PINCTRL_MSM8916=y
 CONFIG_PINCTRL_MSM8996=y
+CONFIG_COMMON_CLK_QCOM=m
+# CONFIG_MSM_GCC_8916 is not set
+# CONFIG_MSM_LCC_8960 is not set
+CONFIG_APQ_GCC_8084=m
+CONFIG_APQ_MMCC_8084=m
+CONFIG_MSM_GCC_8660=m
+CONFIG_MSM_GCC_8960=m
+CONFIG_MSM_MMCC_8960=m
+CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_MMCC_8974=m
+CONFIG_MSM_GCC_8996=m
+CONFIG_MSM_MMCC_8996=m
+# CONFIG_MDM_GCC_9615 is not set
+# CONFIG_MDM_LCC_9615 is not set
 CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_QCOM_BAM_DMA=y
diff --git a/config-armv7-generic b/config-armv7-generic
index 93dead00e..53576d218 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -21,7 +21,6 @@ CONFIG_ARM_THUMBEE=y
 CONFIG_ARM_ASM_UNIFIED=y
 CONFIG_ARM_PATCH_IDIV=y
 CONFIG_ARM_CPU_TOPOLOGY=y
-CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 CONFIG_SWP_EMULATE=y
 CONFIG_CACHE_L2X0=y
 CONFIG_CACHE_L2X0_PMU=y
@@ -168,10 +167,8 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_APPENDED_DTB=y
 
 # General vexpress ARM drivers
-CONFIG_SERIO_AMBAKMI=m
 CONFIG_SERIAL_AMBA_PL010=y
 CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
-
 CONFIG_RTC_DRV_PL030=y
 CONFIG_AMBA_PL08X=y
 CONFIG_SND_ARMAACI=m
@@ -340,6 +337,8 @@ CONFIG_SND_SOC_SNOW=m
 CONFIG_SND_SOC_MAX98090=m
 CONFIG_SND_SOC_MAX98095=m
 CONFIG_SND_SAMSUNG_I2S=m
+CONFIG_SND_SAMSUNG_PCM=m
+CONFIG_SND_SAMSUNG_SPDIF=m
 CONFIG_EXYNOS_AUDSS_CLK_CON=m
 # CONFIG_EXYNOS_IOMMU_DEBUG is not set
 # CONFIG_SAMSUNG_PM_DEBUG is not set
@@ -459,17 +458,11 @@ CONFIG_MFD_TPS65912_SPI=y
 # CONFIG_MFD_TPS80031 is not set
 # CONFIG_TWL4030_CORE is not set
 # CONFIG_TWL6040_CORE is not set
-# 
 
 # Pin stuff
 # CONFIG_PINCTRL_AMD is not set
 # CONFIG_PINCTRL_SAMSUNG is not set
-# CONFIG_PINCTRL_MSM8X74 is not set
 # CONFIG_PINCTRL_BCM281XX is not set
-# CONFIG_PINCTRL_APQ8064 is not set
-# CONFIG_PINCTRL_APQ8084 is not set
-# CONFIG_PINCTRL_MSM8960 is not set
-# CONFIG_PINCTRL_MSM8660 is not set
 # CONFIG_PINCTRL_MDM9615 is not set
 # CONFIG_PINCTRL_MSM8996 is not set
 
@@ -492,7 +485,6 @@ CONFIG_INPUT_GPIO_BEEPER=m
 CONFIG_INPUT_GPIO_TILT_POLLED=m
 CONFIG_INPUT_MATRIXKMAP=m
 CONFIG_KEYBOARD_MATRIX=m
-# CONFIG_GPIO_RCAR is not set
 CONFIG_W1_MASTER_GPIO=m
 
 # HW crypto and rng
@@ -608,15 +600,15 @@ CONFIG_GENERIC_ADC_BATTERY=m
 CONFIG_BATTERY_SBS=m
 
 # Sensors
+# non iio
 CONFIG_SENSORS_AD7314=m
-CONFIG_SENSORS_ADCXX=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_GPIO_FAN=m
-CONFIG_SENSORS_ISL29018=m
-CONFIG_SENSORS_ISL29028=m
-CONFIG_SENSORS_LIS3_SPI=m
 CONFIG_SENSORS_LM70=m
 CONFIG_SENSORS_MAX1111=m
+# iio
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
 CONFIG_MPL115=m
 CONFIG_MPL3115=m
 CONFIG_SI7005=m
@@ -702,8 +694,6 @@ CONFIG_PWM_CROS_EC=m
 CONFIG_STMMAC_PLATFORM=m
 CONFIG_DWMAC_GENERIC=m
 
-# CONFIG_DWMAC_STM32 is not set
-
 CONFIG_R8188EU=m
 
 # CONFIG_88EU_AP_MODE is not set
@@ -789,6 +779,4 @@ CONFIG_R8188EU=m
 # CONFIG_DMADEVICES_DEBUG is not set
 # CONFIG_SERIAL_SAMSUNG_DEBUG is not set
 # CONFIG_OMAP2_DSS_DEBUG is not set
-# CONFIG_CRYPTO_DEV_UX500_DEBUG is not set
-# CONFIG_AB8500_DEBUG is not set
 # CONFIG_DEBUG_LL is not set
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 18126dde8..891087c3c 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -16,7 +16,6 @@ CONFIG_ARM_LPAE=y
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_ARM_VIRT_EXT=y
-CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 
 CONFIG_KVM=y
 CONFIG_KVM_ARM_HOST=y
diff --git a/config-generic b/config-generic
index 36600d849..25a092de6 100644
--- a/config-generic
+++ b/config-generic
@@ -82,8 +82,6 @@ CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_KASAN is not set
 
-# CONFIG_AD525X_DPOT is not set
-
 #
 # Loadable module support
 #
@@ -117,10 +115,10 @@ CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIE_DPC=y
 CONFIG_PCIE_PTM=y
 
+# CONFIG_NTB is not set
 # CONFIG_SGI_IOC4 is not set
 
 # CONFIG_ISA is not set
-# CONFIG_SCx200 is not set
 
 #
 # PCMCIA/CardBus support
@@ -244,6 +242,11 @@ CONFIG_FW_CFG_SYSFS=m
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=m
 
+# EDAC
+CONFIG_EDAC=y
+CONFIG_EDAC_MM_EDAC=m
+CONFIG_EDAC_LEGACY_SYSFS=y
+
 # CONFIG_CMA is not set
 # CONFIG_DMA_CMA is not set
 # CONFIG_FENCE_TRACE is not set
@@ -2007,6 +2010,7 @@ CONFIG_MWIFIEX_SDIO=m
 CONFIG_MWIFIEX_PCIE=m
 CONFIG_MWIFIEX_USB=m
 
+CONFIG_MAC802154=m
 CONFIG_IEEE802154=m
 CONFIG_IEEE802154_SOCKET=m
 CONFIG_IEEE802154_6LOWPAN=m
@@ -2016,11 +2020,10 @@ CONFIG_IEEE802154_ATUSB=m
 CONFIG_IEEE802154_CC2520=m
 CONFIG_IEEE802154_AT86RF230=m
 # CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
-# CONFIG_IEEE802154_ADF7242 is not set
-# CONFIG_IEEE802154_MRF24J40 is not set
+CONFIG_IEEE802154_ADF7242=m
+CONFIG_IEEE802154_MRF24J40=m
 # CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
 
-CONFIG_MAC802154=m
 CONFIG_NET_MPLS_GSO=m
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPLS_IPTUNNEL=m
@@ -2638,7 +2641,6 @@ CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
 # CONFIG_TRACE_SINK is not set
 # CONFIG_DUMMY_IRQ is not set
-# CONFIG_IBM_ASM is not set
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
 CONFIG_TCG_TPM=m
@@ -2675,7 +2677,7 @@ CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_8250_INGENIC is not set
 CONFIG_SERIAL_8250_RT288X=y
-CONFIG_SERIAL_8250_MID=y
+# CONFIG_SERIAL_8250_MID is not set
 CONFIG_SERIAL_8250_MOXA=m
 CONFIG_CYCLADES=m
 # CONFIG_CYZ_INTR is not set
@@ -2773,10 +2775,8 @@ CONFIG_I2C_NFORCE2=m
 CONFIG_I2C_PARPORT=m
 CONFIG_I2C_PARPORT_LIGHT=m
 # CONFIG_I2C_ROBOTFUZZ_OSIF is not set
-CONFIG_I2C_PASEMI=m
 CONFIG_I2C_PCA_PLATFORM=m
 # CONFIG_I2C_PIIX4 is not set
-# CONFIG_SCx200_ACB is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
@@ -2797,9 +2797,6 @@ CONFIG_I2C_DIOLAN_U2C=m
 #
 # I2C Hardware Sensors Chip support
 #
-CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
 CONFIG_SENSORS_AD7414=m
 CONFIG_SENSORS_AD7418=m
 CONFIG_SENSORS_ADC128D818=m
@@ -2815,17 +2812,12 @@ CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
 CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_APPLESMC=m
-CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_CORETEMP=m
 CONFIG_SENSORS_DME1737=m
 CONFIG_SENSORS_DS1621=m
-# CONFIG_DS1682 is not set
 CONFIG_SENSORS_F71805F=m
 CONFIG_SENSORS_F71882FG=m
 CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FSCHMD=m
 CONFIG_SENSORS_FTSTEUTATES=m
 CONFIG_SENSORS_G760A=m
 CONFIG_SENSORS_G762=m
@@ -2839,9 +2831,6 @@ CONFIG_SENSORS_IBMAEM=m
 CONFIG_SENSORS_IBMPEX=m
 # CONFIG_SENSORS_IIO_HWMON is not set
 CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_K10TEMP=m
-CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_SENSORS_LIS3_I2C=m
 # CONFIG_SENSORS_LIS3_SPI is not set
 CONFIG_SENSORS_LM63=m
@@ -2885,14 +2874,7 @@ CONFIG_SENSORS_SMSC47B397=m
 CONFIG_SENSORS_TC74=m
 CONFIG_SENSORS_THMC50=m
 CONFIG_SENSORS_TMP401=m
-CONFIG_APDS9802ALS=m
-CONFIG_ISL29020=m
-CONFIG_ISL29003=m
-CONFIG_SENSORS_BH1770=m
-CONFIG_SENSORS_APDS990X=m
-CONFIG_SENSORS_TSL2550=m
 CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VIA_CPUTEMP=m
 CONFIG_SENSORS_VT1211=m
 CONFIG_SENSORS_VT8231=m
 CONFIG_SENSORS_W83627HF=m
@@ -2950,6 +2932,7 @@ CONFIG_SENSORS_MAX1111=m
 CONFIG_SENSORS_POWR1220=m
 CONFIG_SENSORS_AD7314=m
 
+# PMbus sensors
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_MAX16064=m
@@ -2964,7 +2947,18 @@ CONFIG_SENSORS_MAX197=m
 CONFIG_SENSORS_MAX31790=m
 CONFIG_SENSORS_TPS40422=m
 
-# CONFIG_NTB is not set
+# Misc Sensors
+# CONFIG_AD525X_DPOT is not set
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_SENSORS_TSL2550=m
+# CONFIG_HMC6352 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_TI_DAC7512 is not set
 
 # Industrial I/O subsystem configuration
 CONFIG_IIO=m
@@ -3128,7 +3122,6 @@ CONFIG_PA12203001=m
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 # CONFIG_HI8435 is not set
-# CONFIG_IMX7D_ADC is not set
 # CONFIG_AM2315 is not set
 # CONFIG_BMI160_I2C is not set
 # CONFIG_BMI160_SPI is not set
@@ -3189,13 +3182,10 @@ CONFIG_PA12203001=m
 # CONFIG_AD2S1200 is not set
 # CONFIG_AD2S1210 is not set
 
+# End sensors
 
-
-# CONFIG_HMC6352 is not set
-# CONFIG_PCH_PHUB is not set
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_SRAM is not set
-# CONFIG_TI_DAC7512 is not set
 # CONFIG_MMA7455_SPI is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 
@@ -3251,7 +3241,6 @@ CONFIG_WDTPCI=m
 # CONFIG_ADVANTECH_WDT is not set
 # CONFIG_EUROTECH_WDT is not set
 CONFIG_IB700_WDT=m
-# CONFIG_SCx200_WDT is not set
 # CONFIG_60XX_WDT is not set
 CONFIG_W83877F_WDT=m
 CONFIG_W83627HF_WDT=m
@@ -5359,7 +5348,6 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_PCM512x_SPI is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
 # CONFIG_SND_SOC_PCM179X_SPI is not set
-# CONFIG_SND_SOC_QCOM is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 # CONFIG_SND_SOC_TAS5086 is not set
@@ -5912,8 +5900,6 @@ CONFIG_GPIO_VIPERBOARD=m
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_GRGPIO is not set
-# CONFIG_GPIO_PL061 is not set
-# CONFIG_GPIO_BCM_KONA is not set
 # CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_DWAPB is not set
 # CONFIG_GPIO_74X164 is not set
diff --git a/config-powerpc64-generic b/config-powerpc64-generic
index 88f16569e..d67acd95a 100644
--- a/config-powerpc64-generic
+++ b/config-powerpc64-generic
@@ -222,11 +222,6 @@ CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
 # CONFIG_MACINTOSH_DRIVERS is not set
 # CONFIG_EDAC_CPC925 is not set
 
-
-CONFIG_EDAC=y
-CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_LEGACY_SYSFS=y
-
 # CONFIG_AXON_RAM is not set
 
 CONFIG_SUSPEND_FREEZER=y
diff --git a/config-s390x b/config-s390x
index 89233793f..8ead330ec 100644
--- a/config-s390x
+++ b/config-s390x
@@ -250,8 +250,7 @@ CONFIG_HOTPLUG_PCI_S390=y
 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
-# CONFIG_GAMEPORT_EMU10K1 is not set
-# CONFIG_GAMEPORT_FM801 is not set
+# CONFIG_GAMEPORT is not set
 # CONFIG_SERIO is not set
 
 # CONFIG_ACCESSIBILITY is not set
diff --git a/config-x86-32-generic b/config-x86-32-generic
index ddc9f3047..7cf7362e5 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -22,6 +22,7 @@ CONFIG_M686=y
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MCYRIXIII is not set
 # CONFIG_MVIAC3_2 is not set
+# CONFIG_SCx200 is not set
 # CONFIG_STA2X11 is not set
 
 CONFIG_NR_CPUS=32
@@ -56,8 +57,6 @@ CONFIG_FB_SSD1307=m
 # CONFIG_PCI_GOMMCONFIG is not set
 CONFIG_PCI_GOANY=y
 
-CONFIG_IBM_ASM=m
-
 #
 # APM (Advanced Power Management) BIOS Support
 #
@@ -68,7 +67,6 @@ CONFIG_APM_CPU_IDLE=y
 # CONFIG_APM_DISPLAY_BLANK is not set
 # CONFIG_APM_ALLOW_INTS is not set
 
-
 # CONFIG_X86_POWERNOW_K6 is not set
 CONFIG_X86_POWERNOW_K7=y
 # CONFIG_X86_GX_SUSPMOD is not set
@@ -82,7 +80,6 @@ CONFIG_X86_LONGRUN=y
 # e_powersaver is dangerous
 # CONFIG_X86_E_POWERSAVER is not set
 
-
 # CONFIG_4KSTACKS is not set
 
 CONFIG_PCI_DIRECT=y
@@ -98,7 +95,7 @@ CONFIG_I2C_ALI1563=m
 CONFIG_I2C_SIS5595=m
 CONFIG_I2C_SIS630=m
 
-CONFIG_SCx200_ACB=m
+# CONFIG_SCx200_ACB is not set
 
 # CONFIG_X86_REBOOTFIXUPS is not set
 
@@ -118,19 +115,16 @@ CONFIG_PHYSICAL_START=0x400000
 # CONFIG_KEXEC_JUMP is not set
 
 CONFIG_CRYPTO_AES_586=y
-CONFIG_CRYPTO_DEV_GEODE=m
 CONFIG_CRYPTO_TWOFISH_586=m
 
 CONFIG_VIDEO_CAFE_CCIC=m
 
-
 CONFIG_MTD_NAND_CAFE=m
 
 CONFIG_LBDAF=y
 
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 
-
 CONFIG_OLPC=y
 CONFIG_BATTERY_OLPC=y
 CONFIG_MOUSE_PS2_OLPC=y
@@ -138,17 +132,17 @@ CONFIG_OLPC_XO1_PM=y
 CONFIG_OLPC_XO15_SCI=y
 CONFIG_OLPC_XO1_RTC=y
 CONFIG_OLPC_XO1_SCI=y
-# CONFIG_ALIX is not set
-# staging
+CONFIG_CRYPTO_DEV_GEODE=m
 # CONFIG_FB_OLPC_DCON is not set
 
+# CONFIG_ALIX is not set
+
 # CONFIG_SPARSE_IRQ is not set
 
 CONFIG_RCU_FANOUT=32
 
 # CONFIG_X86_ANCIENT_MCE is not set
 
-
 CONFIG_I2C_PXA=m
 
 # CONFIG_INTEL_TXT is not set
@@ -167,8 +161,6 @@ CONFIG_X86_32_IRIS=m
 CONFIG_POWER_RESET_GPIO=y
 # CONFIG_POWER_RESET_GPIO_RESTART is not set
 
-
-
 CONFIG_MTD_OF_PARTS=y
 CONFIG_MTD_PHYSMAP_OF=m
 CONFIG_SERIAL_OF_PLATFORM=m
@@ -206,10 +198,7 @@ CONFIG_OF=y
 # CONFIG_MLX5_INFINIBAND is not set
 # CONFIG_PINCTRL_SINGLE is not set
 # CONFIG_PINCTRL_BCM281XX is not set
-# CONFIG_PINCTRL_APQ8064 is not set
-# CONFIG_PINCTRL_IPQ8064 is not set
 # CONFIG_COMMON_CLK_SI570 is not set
-# CONFIG_COMMON_CLK_QCOM is not set
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
 # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
 # CONFIG_KEYBOARD_BCM is not set
diff --git a/config-x86-generic b/config-x86-generic
index d4fbe5957..06b844710 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -159,6 +159,7 @@ CONFIG_INTEL_BXT_PMIC_THERMAL=m
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
 CONFIG_HOTPLUG_PCI_IBM=m
+CONFIG_IBM_ASM=m
 
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
@@ -193,10 +194,7 @@ CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
 # CONFIG_DELL_RBU is not set
 CONFIG_DCDBAS=m
 
-CONFIG_EDAC=y
-CONFIG_EDAC_MM_EDAC=m
-# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
-CONFIG_EDAC_AMD64=m
+# CONFIG_EDAC_AMD64 is not set
 CONFIG_EDAC_AMD76X=m
 CONFIG_EDAC_AMD8111=m
 CONFIG_EDAC_AMD8131=m
@@ -215,7 +213,6 @@ CONFIG_EDAC_I7CORE=m
 CONFIG_EDAC_R82600=m
 CONFIG_EDAC_X38=m
 CONFIG_EDAC_DECODE_MCE=m
-CONFIG_EDAC_LEGACY_SYSFS=y
 CONFIG_EDAC_IE31200=m
 
 CONFIG_SCHED_MC=y
@@ -381,11 +378,21 @@ CONFIG_ISCSI_IBFT=m
 CONFIG_INTEL_IOATDMA=m
 CONFIG_INTEL_IDMA64=m
 
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
 CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_SENSORS_I5500=m
+CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_SENSORS_CORETEMP=m
 CONFIG_SENSORS_DELL_SMM=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_I5500=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
 
 # CONFIG_CPA_DEBUG is not set
 
diff --git a/kernel.spec b/kernel.spec
index 11d5eb88b..09ce552ec 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2166,6 +2166,11 @@ fi
 #
 #
 %changelog
+* Mon Nov 28 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARM config updates
+- General config cleanups
+- Enable two 802.15.4 drivers
+
 * Wed Nov 23 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc6.git2.1
 - Linux v4.9-rc6-124-gded9b5d