[kernel/f20] Linux v3.18.4

Justin M. Forbes jforbes at fedoraproject.org
Wed Jan 28 17:31:10 UTC 2015


commit 1d791edb4662ff3ff093248a8d8c1bde3326ca2d
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Wed Jan 28 11:31:01 2015 -0600

    Linux v3.18.4

 ARM-tegra-usb-no-reset.patch                       |   28 +-
 ...-EFI-signature-blob-parser-and-key-loader.patch |   10 +-
 ...acom-Add-support-for-the-Cintiq-Companion.patch |   46 --
 KVM-x86-SYSENTER-emulation-is-broken.patch         |   81 +++
 ...Calculate-extra-tail-size-based-on-queued.patch |   61 --
 ...-uninitialized-kobject-at-CPU-hotplugging.patch |   79 ---
 ...n-t-WARN-about-two-consecutive-Country-IE.patch |   42 --
 config-arm-generic                                 |   16 +-
 config-arm64                                       |   32 +-
 config-armv7                                       |   58 ++-
 config-armv7-generic                               |   70 ++-
 config-armv7-lpae                                  |    3 +-
 config-generic                                     |  113 +++-
 config-powerpc-generic                             |    6 +-
 config-powerpc64                                   |    2 +-
 config-powerpc64le                                 |    1 +
 config-powerpc64p7                                 |    2 +-
 config-s390x                                       |    2 -
 config-x86-32-generic                              |    6 +-
 config-x86-generic                                 |   11 +-
 config-x86_64-generic                              |    3 +-
 crash-driver.patch                                 |   10 +-
 deal-with-deadlock-in-d_walk.patch                 |   86 ---
 disable-libdw-unwind-on-non-x86.patch              |   15 -
 kernel.spec                                        |   99 +---
 ...from-overlapping-d_child-to-overlapping-d.patch |  736 --------------------
 mpssd-x86-only.patch                               |   27 +
 ...onntrack-disable-generic-tracking-for-kno.patch |   91 ---
 perf-install-trace-event-plugins.patch             |   30 -
 ppc64-fixtools.patch                               |   24 -
 ...dd-psmouse_matches_pnp_id-helper-function.patch |   99 ---
 ...-support-for-detecting-FocalTech-PS-2-tou.patch |  157 -----
 sources                                            |    6 +-
 ...FL_NO_ATA_1X-for-Seagate-devices-with-usb.patch |   39 -
 ...FL_NO_REPORT_OPCODES-for-JMicron-JMS566-w.patch |   37 -
 x86-vdso-Use-asm-volatile-in-__getcpu.patch        |   53 --
 ...-Fix-the-vdso-address-randomization-algor.patch |  128 ----
 ...oken-streams-quirk-for-Fresco-Logic-FL100.patch |   45 --
 38 files changed, 391 insertions(+), 1963 deletions(-)
---
diff --git a/ARM-tegra-usb-no-reset.patch b/ARM-tegra-usb-no-reset.patch
index 3b6c906..2b1058b 100644
--- a/ARM-tegra-usb-no-reset.patch
+++ b/ARM-tegra-usb-no-reset.patch
@@ -9,23 +9,23 @@ Patch for disconnect issues with storage attached to a
  1 file changed, 7 insertions(+)
 
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index dc849154f9de..88647f158ed2 100644
+index b649fef2e35d..fb89290710ad 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
-@@ -5038,6 +5038,13 @@ static void hub_events(void)
- 				(u16) hub->change_bits[0],
- 				(u16) hub->event_bits[0]);
+@@ -5023,6 +5023,13 @@ static void hub_event(struct work_struct *work)
+ 			(u16) hub->change_bits[0],
+ 			(u16) hub->event_bits[0]);
  
-+		/* Don't disconnect USB-SATA on TrimSlice */
-+		if (strcmp(dev_name(hdev->bus->controller), "tegra-ehci.0") == 0) {
-+			if ((hdev->state == 7) && (hub->change_bits[0] == 0) &&
-+			    (hub->event_bits[0] == 0x2))
-+				hub->event_bits[0] = 0;
-+		}
++	/* Don't disconnect USB-SATA on TrimSlice */
++	if (strcmp(dev_name(hdev->bus->controller), "tegra-ehci.0") == 0) {
++		if ((hdev->state == 7) && (hub->change_bits[0] == 0) &&
++				(hub->event_bits[0] == 0x2))
++			hub->event_bits[0] = 0;
++	}
 +
- 		/* Lock the device, then check to see if we were
- 		 * disconnected while waiting for the lock to succeed. */
- 		usb_lock_device(hdev);
+ 	/* Lock the device, then check to see if we were
+ 	 * disconnected while waiting for the lock to succeed. */
+ 	usb_lock_device(hdev);
 -- 
-1.9.3
+2.1.0
 
diff --git a/Add-an-EFI-signature-blob-parser-and-key-loader.patch b/Add-an-EFI-signature-blob-parser-and-key-loader.patch
index e78b065..7c5c7e7 100644
--- a/Add-an-EFI-signature-blob-parser-and-key-loader.patch
+++ b/Add-an-EFI-signature-blob-parser-and-key-loader.patch
@@ -159,12 +159,12 @@ index 000000000000..424896a0b169
 +	return 0;
 +}
 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 5ce40e215f15..41359e548bcb 100644
+index 58d7feadd149..b1d686e9175e 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
-@@ -906,6 +906,10 @@ extern bool efi_poweroff_required(void);
- 	     (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size); \
- 	     (md) = (void *)(md) + (m)->desc_size)
+@@ -919,6 +919,10 @@ extern bool efi_poweroff_required(void);
+ char * __init efi_md_typeattr_format(char *buf, size_t size,
+ 				     const efi_memory_desc_t *md);
  
 +struct key;
 +extern int __init parse_efi_signature_list(const void *data, size_t size,
@@ -174,5 +174,5 @@ index 5ce40e215f15..41359e548bcb 100644
   * efi_range_is_wc - check the WC bit on an address range
   * @start: starting kvirt address
 -- 
-1.9.3
+2.1.0
 
diff --git a/KVM-x86-SYSENTER-emulation-is-broken.patch b/KVM-x86-SYSENTER-emulation-is-broken.patch
new file mode 100644
index 0000000..bda8f9e
--- /dev/null
+++ b/KVM-x86-SYSENTER-emulation-is-broken.patch
@@ -0,0 +1,81 @@
+From: Nadav Amit <namit at cs.technion.ac.il>
+Date: Thu, 1 Jan 2015 23:11:11 +0200
+Subject: [PATCH] KVM: x86: SYSENTER emulation is broken
+
+SYSENTER emulation is broken in several ways:
+1. It misses the case of 16-bit code segments completely (CVE-2015-0239).
+2. MSR_IA32_SYSENTER_CS is checked in 64-bit mode incorrectly (bits 0 and 1 can
+   still be set without causing #GP).
+3. MSR_IA32_SYSENTER_EIP and MSR_IA32_SYSENTER_ESP are not masked in
+   legacy-mode.
+4. There is some unneeded code.
+
+Fix it.
+
+Cc: stable at vger.linux.org
+Signed-off-by: Nadav Amit <namit at cs.technion.ac.il>
+Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
+---
+ arch/x86/kvm/emulate.c | 27 ++++++++-------------------
+ 1 file changed, 8 insertions(+), 19 deletions(-)
+
+diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
+index 22e7ed9e6d8e..ac640d47c28d 100644
+--- a/arch/x86/kvm/emulate.c
++++ b/arch/x86/kvm/emulate.c
+@@ -2345,7 +2345,7 @@ static int em_sysenter(struct x86_emulate_ctxt *ctxt)
+ 	 * Not recognized on AMD in compat mode (but is recognized in legacy
+ 	 * mode).
+ 	 */
+-	if ((ctxt->mode == X86EMUL_MODE_PROT32) && (efer & EFER_LMA)
++	if ((ctxt->mode != X86EMUL_MODE_PROT64) && (efer & EFER_LMA)
+ 	    && !vendor_intel(ctxt))
+ 		return emulate_ud(ctxt);
+ 
+@@ -2358,25 +2358,13 @@ static int em_sysenter(struct x86_emulate_ctxt *ctxt)
+ 	setup_syscalls_segments(ctxt, &cs, &ss);
+ 
+ 	ops->get_msr(ctxt, MSR_IA32_SYSENTER_CS, &msr_data);
+-	switch (ctxt->mode) {
+-	case X86EMUL_MODE_PROT32:
+-		if ((msr_data & 0xfffc) == 0x0)
+-			return emulate_gp(ctxt, 0);
+-		break;
+-	case X86EMUL_MODE_PROT64:
+-		if (msr_data == 0x0)
+-			return emulate_gp(ctxt, 0);
+-		break;
+-	default:
+-		break;
+-	}
++	if ((msr_data & 0xfffc) == 0x0)
++		return emulate_gp(ctxt, 0);
+ 
+ 	ctxt->eflags &= ~(EFLG_VM | EFLG_IF);
+-	cs_sel = (u16)msr_data;
+-	cs_sel &= ~SELECTOR_RPL_MASK;
++	cs_sel = (u16)msr_data & ~SELECTOR_RPL_MASK;
+ 	ss_sel = cs_sel + 8;
+-	ss_sel &= ~SELECTOR_RPL_MASK;
+-	if (ctxt->mode == X86EMUL_MODE_PROT64 || (efer & EFER_LMA)) {
++	if (efer & EFER_LMA) {
+ 		cs.d = 0;
+ 		cs.l = 1;
+ 	}
+@@ -2385,10 +2373,11 @@ static int em_sysenter(struct x86_emulate_ctxt *ctxt)
+ 	ops->set_segment(ctxt, ss_sel, &ss, 0, VCPU_SREG_SS);
+ 
+ 	ops->get_msr(ctxt, MSR_IA32_SYSENTER_EIP, &msr_data);
+-	ctxt->_eip = msr_data;
++	ctxt->_eip = (efer & EFER_LMA) ? msr_data : (u32)msr_data;
+ 
+ 	ops->get_msr(ctxt, MSR_IA32_SYSENTER_ESP, &msr_data);
+-	*reg_write(ctxt, VCPU_REGS_RSP) = msr_data;
++	*reg_write(ctxt, VCPU_REGS_RSP) = (efer & EFER_LMA) ? msr_data :
++							      (u32)msr_data;
+ 
+ 	return X86EMUL_CONTINUE;
+ }
+-- 
+2.1.0
+
diff --git a/config-arm-generic b/config-arm-generic
index 1f07efa..c0fa94d 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -24,8 +24,6 @@ CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_GPIO=y
 
 CONFIG_RCU_FANOUT_LEAF=16
-# CONFIG_RTC_DRV_SNVS is not set
-# CONFIG_RTC_DRV_HYM8563 is not set
 CONFIG_BACKLIGHT_PWM=m
 CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_ARM_SP805_WATCHDOG=m
@@ -53,6 +51,7 @@ CONFIG_ARM_SMMU=y
 CONFIG_MMC_ARMMMCI=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIO_AMBAKMI=y
 CONFIG_OC_ETM=y
 CONFIG_FB_ARMCLCD=y
@@ -69,10 +68,10 @@ CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_REGULATOR_VEXPRESS=m
 CONFIG_SENSORS_VEXPRESS=m
 CONFIG_CLKSRC_VERSATILE=y
+CONFIG_POWER_RESET_VERSATILE=y
 # CONFIG_ARM_CHARLCD is not set
 
 # Power/Thermal/Cpufreq
-CONFIG_GENERIC_CPUFREQ_CPU0=m
 # CONFIG_ARM_DT_BL_CPUFREQ is not set
 # CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
 
@@ -87,22 +86,27 @@ CONFIG_OF_FLATTREE=y
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_MDIO=m
 CONFIG_OF_MTD=y
 CONFIG_OF_NET=y
 CONFIG_OF_PCI_IRQ=m
 CONFIG_OF_PCI=m
 CONFIG_OF_RESERVED_MEM=y
+CONFIG_OF_RESOLVE=y
 CONFIG_PATA_OF_PLATFORM=m
 # CONFIG_OF_SELFTEST is not set
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_THERMAL_OF=y
 
+# CONFIG_OF_MDIO is not set
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+
 # External Connectors
 CONFIG_EXTCON=m
 CONFIG_EXTCON_GPIO=m
 CONFIG_EXTCON_ADC_JACK=m
 # CONFIG_EXTCON_SM5502 is not set
+# CONFIG_EXTCON_RT8973A is not set
 
 # MTD
 CONFIG_MTD_BLKDEVS=m
@@ -126,9 +130,9 @@ CONFIG_GPIO_WATCHDOG=m
 CONFIG_GPIOLIB=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
-CONFIG_MDIO_GPIO=m
 CONFIG_BACKLIGHT_GPIO=m
 CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
 CONFIG_POWER_RESET_RESTART=y
 
 #i2c
@@ -183,6 +187,8 @@ CONFIG_CMA_AREAS=7
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
 # CONFIG_LOCK_STAT is not set
 
+# CONFIG_CADENCE_WATCHDOG is not set
+
 # CONFIG_DRM_ARMADA is not set
 # CONFIG_DRM_TEGRA is not set
 # CONFIG_SHMOBILE_IOMMU is not set
diff --git a/config-arm64 b/config-arm64
index dcc1015..9fd40b9 100644
--- a/config-arm64
+++ b/config-arm64
@@ -8,6 +8,7 @@ CONFIG_SCHED_SMT=y
 
 # arm64 only SoCs
 CONFIG_ARCH_XGENE=y
+# CONFIG_ARCH_THUNDER is not set
 
 # CONFIG_AMBA_PL08X is not set
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
@@ -17,7 +18,6 @@ CONFIG_ARM64_64K_PAGES=y
 
 CONFIG_BCMA_POSSIBLE=y
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_BQL=y
 CONFIG_BRCMUTIL=m
 CONFIG_BUG=y
 CONFIG_CLKDEV_LOOKUP=y
@@ -42,7 +42,6 @@ CONFIG_HZ=100
 
 CONFIG_KVM=y
 CONFIG_KVM_ARM_MAX_VCPUS=8
-CONFIG_LOG_BUF_SHIFT=14
 
 CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
@@ -53,7 +52,7 @@ CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_PL330_DMA is not set
 CONFIG_RCU_FANOUT=64
 # CONFIG_RTC_DRV_PL030 is not set
-# CONFIG_RTC_DRV_PL031 is not set
+CONFIG_RTC_DRV_PL031=y
 CONFIG_SERIAL_8250_DMA=y
 # CONFIG_SERIAL_AMBA_PL010 is not set
 CONFIG_SPARSE_IRQ=y
@@ -69,6 +68,7 @@ CONFIG_EFI_VARS=y
 CONFIG_EFIVAR_FS=y
 CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_RTC_DRV_EFI=y
 
 CONFIG_ARM64_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM64_CE=m
@@ -82,6 +82,7 @@ CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 
+CONFIG_ARM64_CPUIDLE=y
 
 # APM Xgene
 CONFIG_POWER_RESET_XGENE=y
@@ -91,13 +92,8 @@ CONFIG_AHCI_XGENE=y
 CONFIG_PHY_XGENE=y
 CONFIG_NET_XGENE=y
 CONFIG_RTC_DRV_XGENE=m
-CONFIG_RTC_DRV_EFI=y
-
-# not arm64
-# CONFIG_GPIO_ADNP is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+CONFIG_HW_RANDOM_XGENE=m
+CONFIG_GPIO_XGENE=y
 
 # busted build for various reasons
 #  uses pci_* for some reason to allocate DMA buffers
@@ -120,7 +116,6 @@ CONFIG_NET_SB1000=y
 CONFIG_SBSAUART_TTY=y
 CONFIG_I2C_SCMI=m
 CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_IMX_THERMAL=m
 CONFIG_PWM_LPSS=m
 CONFIG_ACPI=y
 CONFIG_ACPI_PROCFS_POWER=y
@@ -133,6 +128,17 @@ CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_HED=m
 CONFIG_ACPI_CUSTOM_METHOD=m
 
-CONFIG_AMD_XGBE=y
-CONFIG_AMD_XGBE_PHY=y
+CONFIG_AMD_XGBE=m
+CONFIG_AMD_XGBE_PHY=m
 # CONFIG_AMD_XGBE_DCB is not set
+
+# CONFIG_IMX_THERMAL is not set
+
+# still? 2014-11-11
+# CONFIG_BPF_JIT is not set
+
+CONFIG_DMI=y
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=y
+
+CONFIG_SATA_AHCI_PLATFORM=y
diff --git a/config-armv7 b/config-armv7
index 133a310..652d224 100644
--- a/config-armv7
+++ b/config-armv7
@@ -65,6 +65,7 @@ CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
 CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_MMC_SDHCI_PXAV3=m
 CONFIG_MVPP2=m
+CONFIG_COMMON_CLK_SI5351=m
 # CONFIG_CACHE_FEROCEON_L2 is not set
 # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
 
@@ -164,6 +165,7 @@ CONFIG_RTC_DRV_PALMAS=m
 CONFIG_OMAP5_DSS_HDMI=y
 CONFIG_OMAP5_DSS_HDMI_AUDIO=y
 CONFIG_COMMON_CLK_PALMAS=m
+CONFIG_INPUT_PALMAS_PWRBUTTON=m
 
 CONFIG_WL_TI=y
 CONFIG_WLCORE_SDIO=m
@@ -184,10 +186,9 @@ CONFIG_INPUT_TWL4030_VIBRA=m
 CONFIG_INPUT_TWL6040_VIBRA=m
 CONFIG_KEYBOARD_OMAP4=m
 CONFIG_KEYBOARD_TWL4030=m
+CONFIG_LEDS_TCA6507=m
 
-# OMAP thermal temp. Can likely be built as module but doesn't autoload so build in to ensure performance on PandaES
-CONFIG_TI_SOC_THERMAL=y
-CONFIG_TI_THERMAL=y
+# OMAP thermal temp.
 CONFIG_OMAP4_THERMAL=y
 CONFIG_OMAP5_THERMAL=y
 
@@ -249,9 +250,6 @@ CONFIG_VIDEO_OMAP3=m
 # The ones below are for TI Davinci
 # CONFIG_VIDEO_DM6446_CCDC is not set
 # CONFIG_VIDEO_DM355_CCDC is not set
-# Also enable vivi driver - useful for testing a full kernelspace V4L2 driver
-CONFIG_V4L_TEST_DRIVERS=y
-CONFIG_VIDEO_VIVI=m
 
 CONFIG_SND_OMAP_SOC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
@@ -267,6 +265,7 @@ CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
 CONFIG_SND_OMAP_SOC_RX51=m
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SOC_TWL4030=m
 CONFIG_SND_SOC_TWL6040=m
 CONFIG_SND_SOC_PCM1792A=m
@@ -321,10 +320,16 @@ CONFIG_ARCH_MSM8960=y
 CONFIG_ARCH_MSM8974=y
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
+CONFIG_SERIAL_MSM_HS=m
 CONFIG_PINCTRL_APQ8064=m
+CONFIG_PINCTRL_APQ8084=m
 CONFIG_PINCTRL_IPQ8064=m
 CONFIG_PINCTRL_MSM8960=m
+CONFIG_PINCTRL_MSM8X74=m
 CONFIG_COMMON_CLK_QCOM=m
+CONFIG_MFD_QCOM_RPM=m
+CONFIG_MFD_PM8921_CORE=m
+CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_APQ_GCC_8084=m
 CONFIG_APQ_MMCC_8084=m
 CONFIG_IPQ_GCC_806X=m
@@ -340,16 +345,24 @@ CONFIG_GPIO_MSM_V2=m
 CONFIG_POWER_RESET_MSM=y
 CONFIG_USB_MSM_OTG=m
 CONFIG_MMC_SDHCI_MSM=m
+CONFIG_MMC_QCOM_DML=m
 CONFIG_QCOM_BAM_DMA=m
 CONFIG_QCOM_GSBI=m
 CONFIG_PHY_QCOM_APQ8064_SATA=m
 CONFIG_PHY_QCOM_IPQ806X_SATA=m
+CONFIG_USB_DWC3_QCOM=m
 CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_MSM_IOMMU=y
 CONFIG_DRM_MSM=m
 CONFIG_DRM_MSM_FBDEV=y
 CONFIG_USB_EHCI_MSM=m
+CONFIG_MFD_PM8XXX=m
+CONFIG_KEYBOARD_PMIC8XXX=m
+CONFIG_INPUT_PM8XXX_VIBRATOR=m
+CONFIG_INPUT_PMIC8XXX_PWRKEY=m
+CONFIG_RTC_DRV_PM8XXX=m
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set 
+CONFIG_QCOM_WDT=m
 
 # i.MX
 # CONFIG_MXC_DEBUG_BOARD is not set
@@ -400,6 +413,7 @@ CONFIG_RTC_DRV_SNVS=m
 # CONFIG_FB_IMX is not set
 
 CONFIG_SND_IMX_SOC=m
+CONFIG_SND_SOC_FSL_ASOC_CARD=m
 CONFIG_SND_SOC_FSL_ASRC=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_FSL_SAI=m
@@ -408,14 +422,21 @@ CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_UTILS=m
 CONFIG_SND_SOC_IMX_SSI=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
+CONFIG_SND_SOC_IMX_ES8328=m
 CONFIG_SND_SOC_IMX_PCM_FIQ=m
 CONFIG_SND_SOC_IMX_PCM_DMA=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_WM8962=m
 CONFIG_SND_SOC_IMX_MC13783=m
 CONFIG_SND_SOC_IMX_SPDIF=m
+CONFIG_SND_SOC_CS42XX8_I2C=m
+CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_ES8328_I2C=m
+CONFIG_SND_SOC_ES8328_SPI=m
 CONFIG_SND_SOC_EUKREA_TLV320=m
+CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8962=m
 
 CONFIG_USB_IMX21_HCD=m
 CONFIG_USB_MXS_PHY=m
@@ -480,12 +501,26 @@ CONFIG_REGULATOR_DA9055=m
 CONFIG_ARCH_EXYNOS4=y
 CONFIG_SOC_EXYNOS4212=y
 CONFIG_SOC_EXYNOS4412=y
+CONFIG_ARM_EXYNOS4210_CPUFREQ=y
+CONFIG_ARM_EXYNOS4X12_CPUFREQ=y
+CONFIG_AK8975=m
+CONFIG_CM36651=m
+CONFIG_KEYBOARD_SAMSUNG=m
 
 # Rockchips
 CONFIG_I2C_RK3X=m
 CONFIG_SPI_ROCKCHIP=m
 CONFIG_SND_SOC_ROCKCHIP=m
 CONFIG_PWM_ROCKCHIP=m
+CONFIG_ROCKCHIP_SARADC=m
+CONFIG_ROCKCHIP_IODOMAIN=m
+CONFIG_MMC_DW_ROCKCHIP=m
+CONFIG_EMAC_ROCKCHIP=m
+CONFIG_MFD_RK808=m
+CONFIG_COMMON_CLK_RK808=m
+CONFIG_REGULATOR_RK808=m
+CONFIG_RTC_DRV_HYM8563=m
+CONFIG_ROCKCHIP_SARADC=m
 
 # ST Ericsson
 CONFIG_MACH_HREFV60=y
@@ -508,6 +543,8 @@ CONFIG_AHCI_ST=m
 CONFIG_INPUT_AB8500_PONKEY=m
 CONFIG_REGULATOR_AB8500=y
 CONFIG_AB8500_USB=m
+CONFIG_USB_MUSB_UX500=m
+CONFIG_USB_UX500_DMA=y
 CONFIG_RTC_DRV_AB8500=m
 CONFIG_PWM_AB8500=m
 CONFIG_SND_SOC_UX500=m
@@ -572,19 +609,18 @@ CONFIG_RTC_DRV_TPS6586X=m
 CONFIG_SERIO_OLPC_APSP=m
 
 # Zynq-7xxx
-# likely needs usb still
 CONFIG_SERIAL_UARTLITE=y
 CONFIG_SERIAL_UARTLITE_CONSOLE=y
 CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 CONFIG_COMMON_CLK_AXI_CLKGEN=m
+CONFIG_COMMON_CLK_SI570=m
 CONFIG_ARM_ZYNQ_CPUIDLE=y
 CONFIG_LATTICE_ECP3_CONFIG=m
 CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=m
 CONFIG_GPIO_XILINX=y
-# Broken
-# CONFIG_GPIO_ZYNQ is not set
+CONFIG_GPIO_ZYNQ=m
 CONFIG_I2C_XILINX=m
 CONFIG_SPI_XILINX=m
 CONFIG_SPI_CADENCE=m
@@ -600,6 +636,10 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_GS_FPGABOOT=m
+CONFIG_USB_GADGET_XILINX=m
+CONFIG_PCIE_XILINX=y
+CONFIG_CADENCE_WATCHDOG=m
+CONFIG_REGULATOR_ISL9305=m
 
 # Multi function devices
 CONFIG_MFD_88PM800=m
diff --git a/config-armv7-generic b/config-armv7-generic
index 4a96a54..cd5f89b 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -61,6 +61,7 @@ CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
 # CONFIG_ARCH_HI3xxx is not set
 # CONFIG_ARCH_HISI is not set
 # CONFIG_ARCH_MEDIATEK is not set
+# CONFIG_ARCH_MESON is not set
 # CONFIG_ARCH_QCOM is not set
 # CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_SHMOBILE_MULTI is not set
@@ -112,11 +113,17 @@ CONFIG_SCHED_SMT=y
 
 CONFIG_RCU_FANOUT=32
 
+# Power management / thermal / cpu scaling
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE_GOV_MENU=y
 # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
 
+CONFIG_PM_OPP=y
+CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_ARM_PSCI=y
+CONFIG_THERMAL=y
+CONFIG_CPUFREQ_DT=y
 # CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
 
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
@@ -144,7 +151,6 @@ CONFIG_ARM_TIMER_SP804=y
 CONFIG_SERIO_AMBAKMI=m
 CONFIG_SERIAL_AMBA_PL010=y
 CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
-CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIAL_MRST_MAX3110=m
 
 CONFIG_RTC_DRV_PL030=y
@@ -189,6 +195,7 @@ CONFIG_REGULATOR_AXP20X=m
 CONFIG_IR_SUNXI=m
 CONFIG_MDIO_SUN4I=m
 CONFIG_SUN4I_EMAC=m
+CONFIG_RTC_DRV_SUN6I=m
 
 # Exynos
 CONFIG_ARCH_EXYNOS3=y
@@ -203,8 +210,6 @@ CONFIG_SOC_EXYNOS5410=y
 CONFIG_SOC_EXYNOS5800=y
 CONFIG_SERIAL_SAMSUNG=y
 CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-CONFIG_ARM_EXYNOS4210_CPUFREQ=y
-CONFIG_ARM_EXYNOS4X12_CPUFREQ=y
 CONFIG_ARM_EXYNOS5250_CPUFREQ=y
 CONFIG_ARM_EXYNOS5440_CPUFREQ=y
 CONFIG_ARM_EXYNOS_CPU_FREQ_BOOST_SW=y
@@ -216,6 +221,7 @@ CONFIG_I2C_S3C2410=m
 CONFIG_SPI_S3C64XX=m
 CONFIG_EXYNOS_THERMAL=m
 CONFIG_EXYNOS_THERMAL_CORE=y
+CONFIG_EXYNOS_ADC=m
 CONFIG_MMC_SDHCI_S3C=m
 CONFIG_MMC_SDHCI_S3C_DMA=y
 CONFIG_MMC_DW_EXYNOS=m
@@ -235,6 +241,9 @@ CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
 CONFIG_TCG_TIS_I2C_INFINEON=m
 CONFIG_RTC_DRV_S5M=m
+CONFIG_MFD_WM8994=m
+CONFIG_GPIO_WM8994=m
+CONFIG_REGULATOR_WM8994=m
 # CONFIG_RTC_DRV_S3C is not set
 
 CONFIG_EXYNOS_VIDEO=y
@@ -255,7 +264,14 @@ CONFIG_DRM_EXYNOS_ROTATOR=y
 CONFIG_DRM_EXYNOS_VIDI=y
 CONFIG_PHY_EXYNOS_DP_VIDEO=m
 # CONFIG_FB_S3C is not set
-# CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS is not set
+CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
+CONFIG_PHY_EXYNOS_DP_VIDEO=m
+CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=y
+CONFIG_VIDEO_EXYNOS_FIMC_LITE=m
+CONFIG_VIDEO_EXYNOS4_FIMC_IS=m
+CONFIG_VIDEO_EXYNOS4_ISP_DMA_CAPTURE=y
+CONFIG_VIDEO_S5P_FIMC=m
+CONFIG_VIDEO_S5P_MIPI_CSIS=m
 CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
 CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
 CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
@@ -268,11 +284,10 @@ CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
 CONFIG_SND_SOC_SMDK_WM8994_PCM=m
 CONFIG_SND_SOC_SNOW=m
 CONFIG_SND_SOC_ODROIDX2=m
-# CONFIG_GPIO_WM8994 is not set
-# CONFIG_REGULATOR_WM8994 is not set
 # CONFIG_EXYNOS_IOMMU_DEBUG is not set
 # CONFIG_SAMSUNG_PM_DEBUG is not set
 # CONFIG_SAMSUNG_PM_CHECK is not set
+# CONFIG_ARM_EXYNOS5_BUS_DEVFREQ is not set
 
 # Arndale/Origen
 CONFIG_MFD_MAX8997=y
@@ -282,12 +297,15 @@ CONFIG_REGULATOR_MAX77686=m
 CONFIG_REGULATOR_S2MPA01=m
 CONFIG_REGULATOR_S5M8767=m
 CONFIG_COMMON_CLK_MAX77686=m
+CONFIG_COMMON_CLK_MAX77802=m
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_INPUT_MAX8997_HAPTIC=m
 CONFIG_CHARGER_MAX8997=m
 CONFIG_LEDS_MAX8997=m
 CONFIG_RTC_DRV_MAX8997=m
 CONFIG_RTC_DRV_MAX77686=m
+CONFIG_RTC_DRV_MAX77802=m
+CONFIG_RTC_DRV_RK808=m
 CONFIG_EXTCON_MAX8997=m
 
 # Tegra
@@ -334,6 +352,10 @@ CONFIG_MFD_AS3722=y
 CONFIG_REGULATOR_AS3722=m
 CONFIG_RTC_DRV_AS3722=y
 
+# TI Generic
+CONFIG_TI_SOC_THERMAL=m
+CONFIG_TI_THERMAL=y
+
 # DRM panels
 CONFIG_DRM_PANEL=y
 CONFIG_DRM_PANEL_SIMPLE=m
@@ -351,12 +373,10 @@ CONFIG_REGMAP_IRQ=y
 # Power management
 CONFIG_PM_OPP=y
 CONFIG_ARM_CPU_SUSPEND=y
-CONFIG_GENERIC_CPUFREQ_CPU0=m
 
 # usb
 CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
-# CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_ULPI=y
 CONFIG_AX88796=m
@@ -367,6 +387,7 @@ CONFIG_USB_OTG=y
 CONFIG_USB_GADGET=m
 CONFIG_USB_GADGET_VBUS_DRAW=100
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_USB_GADGET_XILINX is not set
 CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_MUSB_DUAL_ROLE=y
 CONFIG_USB_MUSB_DSPS=m
@@ -436,20 +457,20 @@ CONFIG_GENERIC_PINCONF=y
 # 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_IPQ8064 is not set
 # CONFIG_PINCTRL_MSM8960 is not set
 
 # GPIO
 # CONFIG_GPIO_EM is not set
 CONFIG_GPIO_74X164=m
-CONFIG_GPIO_ADNP=m
-CONFIG_GPIO_MCP23S08=m
 CONFIG_GPIO_MAX7301=m
 CONFIG_GPIO_MC33880=m
 CONFIG_GPIO_TPS65910=y
 CONFIG_GPIO_TPS65912=m
 # CONFIG_GPIO_ZEVIO is not set
 CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO_REGISTER=y
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
@@ -458,6 +479,7 @@ CONFIG_INPUT_GPIO_BEEPER=m
 CONFIG_INPUT_GPIO_TILT_POLLED=m
 CONFIG_INPUT_MATRIXKMAP=m
 CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
 CONFIG_KEYBOARD_MATRIX=m
 # CONFIG_GPIO_RCAR is not set
 CONFIG_W1_MASTER_GPIO=m
@@ -504,10 +526,6 @@ CONFIG_EDAC_LEGACY_SYSFS=y
 
 # Watchdog
 
-# Thermal / powersaving
-CONFIG_THERMAL=y
-CONFIG_ARM_PSCI=y
-
 # Mailbox
 CONFIG_MAILBOX=y
 
@@ -532,6 +550,7 @@ CONFIG_MTD_NAND_PXA3xx=m
 CONFIG_MTD_NAND_RICOH=m
 CONFIG_MTD_NAND_TMIO=m
 CONFIG_MTD_SPI_NOR=m
+# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
 CONFIG_MTD_SPINAND_MT29F=m
 CONFIG_MTD_SPINAND_ONDIEECC=y
 CONFIG_MTD_SST25L=m
@@ -550,6 +569,8 @@ CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
 # CONFIG_MMC_DW_IDMAC is not set
 # CONFIG_MMC_DW_K3 is not set
+# CONFIG_MMC_QCOM_DML is not set
+# CONFIG_MMC_DW_ROCKCHIP is not set
 CONFIG_USB_DWC2=y
 CONFIG_USB_DWC2_HOST=m
 CONFIG_USB_DWC2_PLATFORM=y
@@ -562,6 +583,7 @@ CONFIG_USB_DWC3_OMAP=m
 CONFIG_USB_DWC3_PCI=m
 # CONFIG_USB_DWC3_DEBUG is not set
 # CONFIG_USB_DWC3_KEYSTONE is not set
+# CONFIG_USB_DWC3_QCOM is not set
 # CONFIG_DWC3_HOST_USB3_LPM_ENABLE is not set
 CONFIG_DW_WATCHDOG=m
 CONFIG_PCIE_DW=y
@@ -624,10 +646,18 @@ CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_ALC5623 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_STA350 is not set
+# CONFIG_SND_SOC_CS35L32 is not set
+# CONFIG_SND_SOC_ES8328 is not set
+# CONFIG_SND_SOC_SSM2602_SPI is not set
+# CONFIG_SND_SOC_SSM2602_I2C is not set
+# CONFIG_SND_SOC_SSM4567 is not set
+# CONFIG_SND_SOC_WM8978 is not set
 # CONFIG_SND_ATMEL_SOC is not set
 # CONFIG_SND_SOC_TLV320AIC31XX is not set
 # CONFIG_SND_SOC_TAS2552 is not set
 # CONFIG_SND_SOC_CS4265 is not set
+# CONFIG_SND_SOC_IMX_ES8328 is not set
+# CONFIG_SND_SOC_FSL_ASOC_CARD is not set
 # CONFIG_SND_EDMA_SOC is not set
 # CONFIG_SND_SOC_ROCKCHIP is not set
 
@@ -688,7 +718,11 @@ CONFIG_REGULATOR_TPS80031=m
 CONFIG_REGULATOR_LTC3589=m
 CONFIG_REGULATOR_ANATOP=m
 CONFIG_REGULATOR_DA9211=m
+CONFIG_REGULATOR_ISL9305=m
+CONFIG_REGULATOR_MAX77802=m
+CONFIG_REGULATOR_PWM=m
 
+CONFIG_POWER_AVS=y
 CONFIG_CHARGER_MANAGER=y
 CONFIG_CHARGER_BQ2415X=m
 CONFIG_CHARGER_BQ24190=m
@@ -697,6 +731,7 @@ CONFIG_CHARGER_GPIO=m
 CONFIG_CHARGER_TPS65090=m
 CONFIG_PDA_POWER=m
 CONFIG_GENERIC_ADC_BATTERY=m
+CONFIG_BATTERY_SBS=m
 
 # Sensors
 CONFIG_TMP006=m
@@ -708,6 +743,8 @@ CONFIG_SENSORS_ADCXX=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_GPIO_FAN=m
 CONFIG_SENSORS_HTU21=m
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
 CONFIG_SENSORS_LIS3_SPI=m
 CONFIG_SENSORS_LM70=m
 CONFIG_SENSORS_MAX1111=m
@@ -736,8 +773,10 @@ CONFIG_TOUCHSCREEN_AD7877=m
 CONFIG_TOUCHSCREEN_MC13783=m
 CONFIG_TOUCHSCREEN_TSC2005=m
 
+CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_DAC124S085=m
 CONFIG_LEDS_PWM=m
+CONFIG_LEDS_SYSCON=y
 CONFIG_BMP085_SPI=m
 
 CONFIG_SRAM=y
@@ -785,9 +824,6 @@ CONFIG_MFD_CROS_EC_SPI=m
 CONFIG_KEYBOARD_CROS_EC=m
 CONFIG_I2C_CROS_EC_TUNNEL=m
 
-# Should be in generic
-CONFIG_BPF_JIT=y
-
 # Needs work/investigation
 # CONFIG_ARM_KPROBES_TEST is not set
 
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 661ce36..b08f4da 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -62,7 +62,8 @@ CONFIG_POWER_RESET_KEYSTONE=y
 CONFIG_DAVINCI_WATCHDOG=m
 CONFIG_SPI_DAVINCI=m
 CONFIG_TI_DAVINCI_MDIO=m
-# CONFIG_TI_SOC_THERMAL is not set
+CONFIG_KEYSTONE_IRQ=m
+CONFIG_PCI_KEYSTONE=y
 
 # Tegra (non A15 device options)
 # CONFIG_ARCH_TEGRA_2x_SOC is not set
diff --git a/config-generic b/config-generic
index 56cd80c..f3706ab 100644
--- a/config-generic
+++ b/config-generic
@@ -391,6 +391,7 @@ CONFIG_VHOST_SCSI=m
 # SCSI device support
 #
 CONFIG_SCSI=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
 
 CONFIG_SCSI_ENCLOSURE=m
 CONFIG_SCSI_PROC_FS=y
@@ -705,11 +706,11 @@ CONFIG_FIREWIRE_NOSY=m
 #
 CONFIG_NET=y
 
-CONFIG_NET_DMA=y
-
 CONFIG_NETLINK_MMAP=y
 CONFIG_NETLINK_DIAG=m
 
+CONFIG_BPF_JIT=y
+
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
 CONFIG_TCP_CONG_CUBIC=y
@@ -717,6 +718,7 @@ CONFIG_TCP_CONG_HTCP=m
 CONFIG_TCP_CONG_HSTCP=m
 CONFIG_TCP_CONG_HYBLA=m
 CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
 CONFIG_TCP_CONG_LP=m
 CONFIG_TCP_CONG_SCALABLE=m
 CONFIG_TCP_CONG_VEGAS=m
@@ -758,6 +760,8 @@ CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_SYN_COOKIES=y
 CONFIG_NET_IPVTI=m
+CONFIG_NET_FOU=m
+CONFIG_GENEVE=m
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@@ -776,6 +780,7 @@ CONFIG_IP_VS_PROTO_UDP=y
 CONFIG_IP_VS_PROTO_ESP=y
 CONFIG_IP_VS_PROTO_AH=y
 CONFIG_IP_VS_PROTO_SCTP=y
+CONFIG_IP_VS_FO=m
 CONFIG_IP_VS_IPV6=y
 CONFIG_IP_VS_RR=m
 CONFIG_IP_VS_WRR=m
@@ -1017,12 +1022,16 @@ CONFIG_NFT_HASH=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_MASQ_IPV4=m
+CONFIG_NFT_MASQ_IPV6=m
 CONFIG_NFT_NAT=m
 CONFIG_NFT_QUEUE=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_COMPAT=m
 
 CONFIG_NF_TABLES_IPV4=m
+CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
@@ -1082,6 +1091,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
 CONFIG_IP_SET_HASH_IPPORT=m
 CONFIG_IP_SET_HASH_IPPORTIP=m
 CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_MAC=m
 CONFIG_IP_SET_HASH_NETPORTNET=m
 CONFIG_IP_SET_HASH_NET=m
 CONFIG_IP_SET_HASH_NETNET=m
@@ -1207,6 +1217,7 @@ CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=y
 CONFIG_OPENVSWITCH_VXLAN=y
+CONFIG_OPENVSWITCH_GENEVE=y
 CONFIG_VSOCKETS=m
 
 
@@ -1306,6 +1317,8 @@ CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_ADAPTEC_STARFIRE=m
 
+# CONFIG_NET_VENDOR_AGERE is not set
+
 CONFIG_NET_VENDOR_ALTEON=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@@ -1321,6 +1334,7 @@ CONFIG_PCMCIA_NMCLAN=m
 
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_ARC_EMAC=m
+# CONFIG_EMAC_ROCKCHIP is not set
 
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ALX=m
@@ -1401,8 +1415,10 @@ CONFIG_IXGBE_HWMON=y
 CONFIG_I40E=m
 # CONFIG_I40E_VXLAN is not set
 # CONFIG_I40E_DCB is not set
+# CONFIG_I40E_FCOE is not set
 CONFIG_I40EVF=m
-
+CONFIG_FM10K=m
+# CONFIG_FM10K_VXLAN is not set
 
 # CONFIG_NET_VENDOR_I825XX is not set
 CONFIG_NET_VENDOR_MARVELL=y
@@ -1454,6 +1470,8 @@ CONFIG_QLCNIC_HWMON=y
 CONFIG_QLGE=m
 CONFIG_NETXEN_NIC=m
 
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+
 CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_ATP=m
 CONFIG_8139CP=m
@@ -1526,6 +1544,7 @@ CONFIG_DAVICOM_PHY=m
 CONFIG_DP83640_PHY=m
 CONFIG_FIXED_PHY=y
 CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_BCM_UNIMAC=m
 CONFIG_NATIONAL_PHY=m
 CONFIG_ICPLUS_PHY=m
 CONFIG_BCM63XX_PHY=m
@@ -1652,11 +1671,14 @@ CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 # CONFIG_ATH9K_STATION_STATISTICS is not set
 # CONFIG_ATH9K_WOW is not set
+# CONFIG_ATH9K_DYNACK is not set
+# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
 # 
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 # CONFIG_ATH10K_DEBUG is not set
 # CONFIG_ATH10K_TRACING is not set
+# CONFIG_ATH_TRACEPOINTS is not set
 CONFIG_ATH10K_DEBUGFS=y
 CONFIG_WCN36XX=m
 # CONFIG_WCN36XX_DEBUGFS is not set
@@ -1723,12 +1745,15 @@ CONFIG_LIBERTAS_SDIO=m
 # CONFIG_LIBERTAS_THINFIRM is not set
 # CONFIG_LIBERTAS_SPI is not set
 CONFIG_LIBERTAS_MESH=y
+
 CONFIG_IWLWIFI=m
 CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m
 # CONFIG_IWLWIFI_BCAST_FILTERING is not set
+# CONFIG_IWLWIFI_UAPSD is not set
 CONFIG_IWLWIFI_DEBUG=y
 CONFIG_IWLWIFI_DEBUGFS=y
+
 CONFIG_IWLEGACY=m
 CONFIG_IWLEGACY_DEBUG=y
 CONFIG_IWLEGACY_DEBUGFS=y
@@ -1736,6 +1761,7 @@ CONFIG_IWL4965=y
 CONFIG_IWL3945=m
 # CONFIG_IWM is not set
 # CONFIG_IWLWIFI_DEBUG_EXPERIMENTAL_UCODE is not set
+
 CONFIG_MAC80211_HWSIM=m
 CONFIG_P54_COMMON=m
 CONFIG_P54_USB=m
@@ -1792,9 +1818,11 @@ CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
 CONFIG_RTL8192CU=m
 CONFIG_RTL8192DE=m
+CONFIG_RTL8192EE=m
 CONFIG_RTL8723AE=m
 CONFIG_RTL8723BE=m
 CONFIG_RTL8188EE=m
+CONFIG_RTL8821AE=m
 
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
@@ -2118,6 +2146,8 @@ CONFIG_INPUT_SPARSEKMAP=m
 CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
 CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
+# CONFIG_INPUT_DRV260X_HAPTICS is not set
+# CONFIG_INPUT_DRV2667_HAPTICS is not set
 
 #
 # Input I/O drivers
@@ -2259,6 +2289,7 @@ CONFIG_TOUCHSCREEN_ZFORCE=m
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
 # CONFIG_TOUCHSCREEN_AD7877 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
+# CONFIG_TOUCHSCREEN_AR1021_I2C is not set
 
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
@@ -2617,8 +2648,10 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m
 # CONFIG_AD5380 is not set
 # CONFIG_AD5064 is not set
 # CONFIG_BMA180 is not set
+# CONFIG_BMC150_ACCEL is not set
 # CONFIG_MAX1363 is not set
 # CONFIG_MAX517 is not set
+# CONFIG_MAX5821 is not set
 # CONFIG_MCP4725 is not set
 # CONFIG_ITG3200 is not set
 # CONFIG_APDS9300 is not set
@@ -2632,10 +2665,9 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m
 # CONFIG_TSL4531 is not set
 # CONFIG_NAU7802 is not set
 # CONFIG_TI_ADC081C is not set
-# CONFIG_EXYNOS_ADC is not set
+# CONFIG_TI_ADC128S052 is not set
 # CONFIG_VIPERBOARD_ADC is not set
 # CONFIG_VF610_ADC is not set
-# CONFIG_XILINX_XADC is not set
 # CONFIG_INV_MPU6050_IIO is not set
 CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_MAGN_3AXIS=m
@@ -2643,6 +2675,7 @@ CONFIG_IIO_ST_ACCEL_3AXIS=m
 CONFIG_HID_SENSOR_INCLINOMETER_3D=m
 CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # CONFIG_ADJD_S311 is not set
+# CONFIG_AL3320A is not set
 # CONFIG_SENSORS_TSL2563 is not set
 # CONFIG_SENSORS_HMC5843_I2C is not set
 # CONFIG_VCNL4000 is not set
@@ -2681,6 +2714,7 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # CONFIG_ADIS16136 is not set
 # CONFIG_ADIS16260 is not set
 # CONFIG_ADXRS450 is not set
+# CONFIG_BMG160 is not set
 # CONFIG_ADIS16400 is not set
 # CONFIG_ADIS16480 is not set
 # CONFIG_DHT11 is not set
@@ -2688,7 +2722,7 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # CONFIG_MPL115 is not set
 # CONFIG_SI7005 is not set
 # CONFIG_AS3935 is not set
-# CONFIG_KXCJK1013 is not set
+CONFIG_KXCJK1013=m
 # CONFIG_ISL29125 is not set
 # CONFIG_TCS3414 is not set
 # CONFIG_AK09911 is not set
@@ -2724,13 +2758,8 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 # CONFIG_AD7816 is not set
 # CONFIG_AD7192 is not set
 # CONFIG_AD7280 is not set
-# CONFIG_AD5930 is not set
 # CONFIG_AD9832 is not set
 # CONFIG_AD9834 is not set
-# CONFIG_AD9850 is not set
-# CONFIG_AD9852 is not set
-# CONFIG_AD9910 is not set
-# CONFIG_AD9951 is not set
 # CONFIG_ADIS16060 is not set
 # CONFIG_ADE7753 is not set
 # CONFIG_ADE7754 is not set
@@ -2859,6 +2888,7 @@ CONFIG_RTC_DRV_DS1742=m
 CONFIG_RTC_DRV_DS1374=m
 # CONFIG_RTC_DRV_EP93XX is not set
 CONFIG_RTC_DRV_FM3130=m
+# CONFIG_RTC_DRV_HYM8563 is not set
 CONFIG_RTC_DRV_ISL1208=m
 CONFIG_RTC_DRV_M41T80=m
 CONFIG_RTC_DRV_M41T80_WDT=y
@@ -2870,6 +2900,7 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
 # CONFIG_RTC_DRV_SA1100 is not set
+# CONFIG_RTC_DRV_SNVS is not set
 # CONFIG_RTC_DRV_TEST is not set
 CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_PCF8523=m
@@ -3077,6 +3108,8 @@ CONFIG_VIDEO_TM6000_DVB=m
 CONFIG_VIDEO_TLG2300=m
 # CONFIG_VIDEO_TIMBERDALE is not set
 # CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_TW68 is not set
+# CONFIG_VIDEO_VIVID is not set
 # CONFIG_EXYNOS_VIDEO is not set
 CONFIG_VIDEO_USBTV=m
 # CONFIG_VIDEO_AU0828_RC is not set
@@ -3117,6 +3150,7 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 CONFIG_DVB_BT8XX=m
 CONFIG_DVB_BUDGET_CORE=m
 CONFIG_DVB_PLUTO2=m
+# CONFIG_DVB_PT3 is not set
 CONFIG_SMS_SIANO_MDTV=m
 CONFIG_SMS_SIANO_RC=y
 # CONFIG_SMS_SIANO_DEBUGFS is not set
@@ -3184,6 +3218,7 @@ CONFIG_DVB_USB_AZ6007=m
 CONFIG_DVB_USB_LME2510=m
 CONFIG_DVB_USB_RTL28XXU=m
 CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_DVBSKY=m
 
 CONFIG_DVB_PT1=m
 
@@ -3229,6 +3264,7 @@ CONFIG_IR_IGUANA=m
 CONFIG_IR_TTUSBIR=m
 CONFIG_IR_GPIO_CIR=m
 CONFIG_IR_XMP_DECODER=m
+CONFIG_IR_HIX5HD2=m
 
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
@@ -3499,7 +3535,7 @@ CONFIG_SND_FIREWIRE_SPEAKERS=m
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_SCS1X=m
 CONFIG_SND_DICE=m
-# CONFIG_SND_FIREWORKS is not set
+CONFIG_SND_FIREWORKS=m
 # CONFIG_SND_BEBOB is not set
 
 #
@@ -3619,6 +3655,7 @@ CONFIG_HID_ICADE=m
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_ORTEK=m
 CONFIG_HID_PANTHERLORD=m
+CONFIG_HID_PENMOUNT=m
 CONFIG_HID_PETALYNX=m
 CONFIG_HID_PICOLCD=m
 CONFIG_HID_RMI=m
@@ -3733,6 +3770,7 @@ CONFIG_USB_S2255=m
 # CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
 CONFIG_USB_ZR364XX=m
 # CONFIG_SOC_CAMERA is not set
+# CONFIG_SOC_TI is not set
 
 #
 # USB Network adaptors
@@ -3837,7 +3875,6 @@ CONFIG_USB_SERIAL_MCT_U232=m
 CONFIG_USB_SERIAL_MOS7720=m
 CONFIG_USB_SERIAL_MOS7715_PARPORT=y
 # CONFIG_USB_SERIAL_WISHBONE is not set
-# CONFIG_USB_SERIAL_ZTE is not set
 CONFIG_USB_SERIAL_MOS7840=m
 # CONFIG_USB_SERIAL_MXUPORT is not set
 CONFIG_USB_SERIAL_NAVMAN=m
@@ -3881,16 +3918,12 @@ CONFIG_USB_PHY=y
 # CONFIG_USB_OTG_FSM is not set
 
 # CONFIG_GENERIC_PHY is not set
-# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set
-# CONFIG_PHY_EXYNOS_DP_VIDEO is not set
 # CONFIG_PHY_ST_SPEAR1310_MIPHY is not set
 # CONFIG_PHY_ST_SPEAR1340_MIPHY is not set
 # CONFIG_AM335X_PHY_USB is not set
 # CONFIG_SAMSUNG_USBPHY is not set
-# CONFIG_SAMSUNG_USB2PHY is not set
-# CONFIG_SAMSUNG_USB3PHY is not set
 # CONFIG_BCM_KONA_USB2_PHY is not set
-CONFIG_USB_RCAR_PHY=m
+# CONFIG_USB_RCAR_PHY is not set
 CONFIG_USB_ATM=m
 CONFIG_USB_CXACRU=m
 # CONFIG_USB_C67X00_HCD is not set
@@ -3936,6 +3969,8 @@ CONFIG_USB_XUSBATM=m
 # CONFIG_USB_DWC2 is not set
 # CONFIG_USB_ISP1301 is not set
 # CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+CONFIG_USB_LED_TRIG=y
 
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 
@@ -4013,6 +4048,10 @@ CONFIG_MFD_VIPERBOARD=m
 # CONFIG_MFD_TPS65912_SPI is not set
 # CONFIG_MFD_MC13XXX_SPI is not set
 # CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_MENF21BMC is not set
+# CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_MFD_RK808 is not set
+# CONFIG_MFD_RN5T618 is not set
 # CONFIG_EZX_PCAP is not set
 # CONFIG_INTEL_SOC_PMIC is not set
 
@@ -4148,6 +4187,7 @@ CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
 CONFIG_FUSE_FS=m
+CONFIG_OVERLAY_FS=m
 # CONFIG_OMFS_FS is not set
 CONFIG_CUSE=m
 CONFIG_F2FS_FS=m
@@ -4452,6 +4492,7 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_BLKCIPHER=y
 # CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_MCRYPTD is not set
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_ANUBIS=m
@@ -4630,6 +4671,7 @@ CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_GOV_FAIR_SHARE=y
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
 CONFIG_THERMAL_GOV_STEP_WISE=y
+# CONFIG_THERMAL_GOV_BANG_BANG is not set
 # CONFIG_THERMAL_EMULATION is not set
 # CONFIG_THERMAL_OF is not set
 # CONFIG_CPU_THERMAL is not set
@@ -4726,6 +4768,7 @@ CONFIG_LEDS_DELL_NETBOOKS=m
 # CONFIG_LEDS_PWM is not set
 # CONFIG_LEDS_LP8501 is not set
 # CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_SYSCON is not set
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
@@ -4798,6 +4841,7 @@ CONFIG_OPTPROBES=y
 CONFIG_HZ_1000=y
 CONFIG_NO_HZ=y
 
+# CONFIG_SCHED_STACK_END_CHECK is not set
 CONFIG_TIMER_STATS=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_PERF_EVENTS=y
@@ -4838,6 +4882,8 @@ CONFIG_APM_POWER=m
 # CONFIG_CHARGER_BQ24190 is not set
 # CONFIG_CHARGER_BQ24735 is not set
 CONFIG_POWER_RESET=y
+# CONFIG_POWER_RESET_LTC2952 is not set
+# CONFIG_POWER_RESET_SYSCON is not set
 
 # CONFIG_PDA_POWER is not set
 
@@ -4921,6 +4967,8 @@ CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MV88E6060=m
 CONFIG_NET_DSA_MV88E6131=m
 CONFIG_NET_DSA_MV88E6123_61_65=m
+CONFIG_NET_DSA_MV88E6171=m
+CONFIG_NET_DSA_BCM_SF2=m
 
 # Used by Maemo, we don't care.
 # CONFIG_PHONET is not set
@@ -4936,6 +4984,7 @@ CONFIG_NET_DSA_MV88E6123_61_65=m
 CONFIG_WM8350_POWER=m
 
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_PCI_SKELETON is not set
 
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
@@ -4980,9 +5029,6 @@ CONFIG_RTL8192E=m
 # CONFIG_INPUT_GPIO is not set
 # CONFIG_VIDEO_CX25821 is not set
 # CONFIG_R8188EU is not set
-# Larry Finger maintains (rhbz 1113422)
-CONFIG_R8192EE=m
-# CONFIG_R8821AE is not set
 # CONFIG_RTL8192U is not set
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
 # CONFIG_8723AU_AP_MODE is not set
@@ -5014,7 +5060,6 @@ CONFIG_USBIP_HOST=m
 # CONFIG_DGNC is not set
 # CONFIG_RTS5208 is not set
 # CONFIG_GS_FPGABOOT is not set
-# CONFIG_BT_NOKIA_H4P is not set
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_MEDIA_TUNER_MSI001 is not set
 # END OF STAGING
@@ -5026,6 +5071,8 @@ CONFIG_USBIP_HOST=m
 
 CONFIG_NOP_USB_XCEIV=m
 
+# CONFIG_INTEGRITY is not set
+
 # CONFIG_IMA is not set
 CONFIG_IMA_MEASURE_PCR_IDX=10
 CONFIG_IMA_LSM_RULES=y
@@ -5046,6 +5093,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_RCU_TRACE is not set
 # CONFIG_RCU_CPU_STALL_INFO is not set
+# CONFIG_TASKS_RCU is not set
 # CONFIG_RCU_USER_QS is not set
 CONFIG_SPARSE_RCU_POINTER=y
 
@@ -5097,6 +5145,7 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_CS5535 is not set
+# CONFIG_GPIO_ADNP is not set
 # CONFIG_GPIO_ADP5588 is not set
 # CONFIG_GPIO_IT8761E is not set
 # CONFIG SB105x is not set
@@ -5124,6 +5173,7 @@ CONFIG_GPIO_VIPERBOARD=m
 # CONFIG_GPIO_74X164 is not set
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_MCP23S08 is not set
 
 # FIXME: Why?
 
@@ -5147,6 +5197,7 @@ CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_PSCSI=m
 CONFIG_TCM_FC=m
+CONFIG_TCM_USER=m
 
 CONFIG_HWSPINLOCK=m
 
@@ -5155,7 +5206,7 @@ CONFIG_PSTORE_RAM=m
 # CONFIG_PSTORE_CONSOLE is not set
 # CONFIG_PSTORE_FTRACE is not set
 
-# CONFIG_TEST_MODULE is not set
+# CONFIG_TEST_LKM is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
 # CONFIG_TEST_UDELAY is not set
@@ -5201,8 +5252,19 @@ CONFIG_POWERCAP=y
 
 # CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
 
+# CONFIG_HMC_DRV is not set
+
 # CONFIG_PM_DEVFREQ is not set
+# CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND is not set
+# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+# CONFIG_DEVFREQ_GOV_USERSPACE is not set
+
+# CONFIG_CPUFREQ_DT is not set
+
 # CONFIG_MODULE_SIG is not set
+# FIXME: Revisit this to see if we can use it instead of the spec file stuff
+# CONFIG_MODULE_COMPRESS is not set
 # CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 
@@ -5212,3 +5274,8 @@ CONFIG_POWERCAP=y
 # CONFIG_GLOB_SELFTEST is not set
 
 # CONFIG_SBSAUART_TTY is not set
+
+# CONFIG_SERIAL_8250_FINTEK is not set
+
+# set in x86-generic presently
+# CONFIG_TOUCHSCREEN_GOODIX is not set
diff --git a/config-powerpc-generic b/config-powerpc-generic
index bc0f943..ce4da57 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -309,7 +309,6 @@ CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 
 # CONFIG_PPC_MPC512x is not set
 # CONFIG_RTC_DRV_MPC5121 is not set
-# CONFIG_RTC_DRV_HYM8563 is not set
 
 # CONFIG_MPC512X_DMA is not set
 
@@ -323,8 +322,6 @@ CONFIG_I2C_MPC=m
 # CONFIG_CRYPTO_DEV_FSL_CAAM is not set
 # CONFIG_CRYPTO_SHA1_PPC is not set
 
-# CONFIG_GPIO_MCP23S08 is not set
-
 # CONFIG_CAN_FLEXCAN is not set
 # CONFIG_NET_VENDOR_XILINX is not set
 # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
@@ -351,15 +348,14 @@ CONFIG_RCU_FANOUT_LEAF=16
 
 CONFIG_PPC_DENORMALISATION=y
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-# CONFIG_GPIO_ADNP is not set
 # CONFIG_MFD_SYSCON is not set
-# CONFIG_RTC_DRV_SNVS is not set
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
 
 
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 
 CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
 CONFIG_FB_SSD1307=m
 CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_BACKLIGHT_PWM=m
diff --git a/config-powerpc64 b/config-powerpc64
index e24be4f..49b4f2e 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -171,8 +171,8 @@ CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 
+CONFIG_CXL=m
 
-CONFIG_BPF_JIT=y
 # CONFIG_PPC_ICSWX_PID is not set
 # CONFIG_PPC_ICSWX_USE_SIGILL is not set
 # CONFIG_PCIEPORTBUS is not set
diff --git a/config-powerpc64le b/config-powerpc64le
new file mode 100644
index 0000000..ee43fdb
--- /dev/null
+++ b/config-powerpc64le
@@ -0,0 +1 @@
+CONFIG_CPU_LITTLE_ENDIAN=y
diff --git a/config-powerpc64p7 b/config-powerpc64p7
index 60baede..6a5e1c6 100644
--- a/config-powerpc64p7
+++ b/config-powerpc64p7
@@ -161,8 +161,8 @@ CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 
+CONFIG_CXL=m
 
-CONFIG_BPF_JIT=y
 # CONFIG_PPC_ICSWX_PID is not set
 # CONFIG_PPC_ICSWX_USE_SIGILL is not set
 # CONFIG_PCIEPORTBUS is not set
diff --git a/config-s390x b/config-s390x
index 78ba8e9..9534f51 100644
--- a/config-s390x
+++ b/config-s390x
@@ -83,7 +83,6 @@ CONFIG_TN3270_FS=m
 #
 CONFIG_S390_TAPE_34XX=m
 
-# CONFIG_PPP is not set
 # CONFIG_SLIP is not set
 
 #
@@ -213,7 +212,6 @@ CONFIG_SCHED_BOOK=y
 
 CONFIG_CRYPTO_GHASH_S390=m
 
-CONFIG_BPF_JIT=y
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
 CONFIG_SCM_BUS=y
 CONFIG_EADM_SCH=m
diff --git a/config-x86-32-generic b/config-x86-32-generic
index 13e1bac..5daa9b8 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -78,7 +78,6 @@ CONFIG_X86_SPEEDSTEP_LIB=y
 CONFIG_X86_LONGRUN=y
 # CONFIG_X86_LONGHAUL is not set
 # CONFIG_X86_CPUFREQ_NFORCE2 is not set
-# CONFIG_GENERIC_CPUFREQ_CPU0 is not set
 # e_powersaver is dangerous
 # CONFIG_X86_E_POWERSAVER is not set
 
@@ -168,6 +167,7 @@ CONFIG_XO1_RFKILL=m
 CONFIG_X86_32_IRIS=m
 
 CONFIG_POWER_RESET_GPIO=y
+# CONFIG_POWER_RESET_GPIO_RESTART is not set
 
 
 
@@ -206,14 +206,10 @@ CONFIG_BACKLIGHT_PWM=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_GPIO_SODAVILLE is not set
-# CONFIG_GPIO_ADNP is not set
 # CONFIG_BACKLIGHT_OT200 is not set
-# CONFIG_RTC_DRV_SNVS is not set
-# CONFIG_RTC_DRV_HYM8563 is not set
 
 # CONFIG_MLX5_INFINIBAND is not set
 # CONFIG_PINCTRL_SINGLE is not set
-# CONFIG_PINCTRL_MSM8X74 is not set
 # CONFIG_PINCTRL_BCM281XX is not set
 # CONFIG_PINCTRL_APQ8064 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
diff --git a/config-x86-generic b/config-x86-generic
index 93f78f2..1af8775 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -240,6 +240,7 @@ CONFIG_INTEL_SMARTCONNECT=y
 CONFIG_PVPANIC=m
 
 # CONFIG_TOUCHSCREEN_INTEL_MID is not set
+CONFIG_TOUCHSCREEN_GOODIX=m
 
 # CONFIG_SMSC37B787_WDT is not set
 CONFIG_VIA_WDT=m
@@ -293,6 +294,8 @@ CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
 CONFIG_XEN_SELFBALLOONING=y
 CONFIG_XEN_PCIDEV_BACKEND=m
 CONFIG_XEN_ACPI_PROCESSOR=m
+# CONFIG_XEN_SCSI_FRONTEND is not set
+# CONFIG_XEN_SCSI_BACKEND is not set
 
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
@@ -376,7 +379,6 @@ CONFIG_LPC_ICH=m
 
 CONFIG_GPIO_ICH=m
 # CONFIG_GPIO_LYNXPOINT is not set
-# CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_GPIO_F7188X is not set
 
 # These should all go away with IC2_ACPI is fixed
@@ -406,7 +408,6 @@ CONFIG_GPIO_ICH=m
 # CONFIG_TWL4030_CORE is not set
 # CONFIG_TWL6040_CORE is not set
 
-
 CONFIG_PCI_CNB20LE_QUIRK=y
 
 CONFIG_ACPI_EC_DEBUGFS=m
@@ -480,15 +481,19 @@ CONFIG_NFC_MICROREAD_MEI=m
 # CONFIG_X86_GOLDFISH is not set
 
 CONFIG_X86_INTEL_LPSS=y
+CONFIG_IOSF_MBI=m
+# CONFIG_IOSF_MBI_DEBUG is not set
 CONFIG_PWM_LPSS=m
+CONFIG_PWM_LPSS_PCI=m
+CONFIG_PWM_LPSS_PLATFORM=m
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_BAYTRAIL=y
 
 # CONFIG_INTEL_POWERCLAMP is not set
 CONFIG_X86_PKG_TEMP_THERMAL=m
-CONFIG_ACPI_INT3403_THERMAL=m
 CONFIG_INTEL_SOC_DTS_THERMAL=m
 CONFIG_INTEL_RAPL=m
+CONFIG_INT340X_THERMAL=m
 
 CONFIG_VMWARE_VMCI=m
 CONFIG_VMWARE_VMCI_VSOCKETS=m
diff --git a/config-x86_64-generic b/config-x86_64-generic
index de46713..89b7070 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -57,6 +57,7 @@ CONFIG_INTEL_MIC_X100_DMA=m
 # SHPC has half-arsed PCI probing, which makes it load on too many systems
 CONFIG_HOTPLUG_PCI_SHPC=m
 
+# CONFIG_CRYPTO_SHA1_MB is not set
 CONFIG_CRYPTO_AES_X86_64=y
 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64=m
@@ -152,8 +153,6 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
 
 CONFIG_I7300_IDLE=m
 
-CONFIG_BPF_JIT=y
-
 # https://fedoraproject.org/wiki/Features/Checkpoint_Restore
 CONFIG_CHECKPOINT_RESTORE=y
 
diff --git a/crash-driver.patch b/crash-driver.patch
index 9ec016d..5a8fa87 100644
--- a/crash-driver.patch
+++ b/crash-driver.patch
@@ -269,7 +269,7 @@ index 000000000000..fd4736ec99f5
 +
 +#endif /* _X86_CRASH_H */
 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index 6e9f74a5c095..ee6bae16b04c 100644
+index efefd12a0f7b..6a318132b7ee 100644
 --- a/drivers/char/Kconfig
 +++ b/drivers/char/Kconfig
 @@ -4,6 +4,9 @@
@@ -283,13 +283,13 @@ index 6e9f74a5c095..ee6bae16b04c 100644
  
  config DEVKMEM
 diff --git a/drivers/char/Makefile b/drivers/char/Makefile
-index a324f9303e36..33ce2fb1d0a3 100644
+index d06cde26031b..0832636fd9bc 100644
 --- a/drivers/char/Makefile
 +++ b/drivers/char/Makefile
-@@ -61,3 +61,5 @@ obj-$(CONFIG_JS_RTC)		+= js-rtc.o
- js-rtc-y = rtc.o
+@@ -62,3 +62,5 @@ js-rtc-y = rtc.o
  
  obj-$(CONFIG_TILE_SROM)		+= tile-srom.o
+ obj-$(CONFIG_XILLYBUS)		+= xillybus/
 +
 +obj-$(CONFIG_CRASH)            += crash.o
 diff --git a/drivers/char/crash.c b/drivers/char/crash.c
@@ -505,5 +505,5 @@ index 000000000000..25ab9869d566
 +
 +#endif /* __CRASH_H__ */
 -- 
-1.9.3
+2.1.0
 
diff --git a/kernel.spec b/kernel.spec
index 8c0d62f..0f7916b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,19 +62,19 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 201
+%global baserelease 100
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
 # on top of -- for example, 3.1-rc7-git1 starts with a 3.0 base,
 # which yields a base_sublevel of 0.
-%define base_sublevel 17
+%define base_sublevel 18
 
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 8
+%define stable_update 4
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -689,7 +689,7 @@ Patch14010: lis3-improve-handling-of-null-rate.patch
 Patch15000: watchdog-Disable-watchdog-on-virtual-machines.patch
 
 # PPC
-Patch18000: ppc64-fixtools.patch
+
 # ARM64
 
 # ARMv7
@@ -717,57 +717,24 @@ Patch21247: ath9k-rx-dma-stop-check.patch
 
 Patch22000: weird-root-dentry-name-debug.patch
 
-#rhbz 1025603
-Patch25063: disable-libdw-unwind-on-non-x86.patch
-
-Patch26000: perf-install-trace-event-plugins.patch
-
 # Patch series from Hans for various backlight and platform driver fixes
 Patch26002: samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch
 
-#rhbz 1134969
-Patch26016: HID-wacom-Add-support-for-the-Cintiq-Companion.patch
-
-#rhbz 1110011
-Patch26019: psmouse-Add-psmouse_matches_pnp_id-helper-function.patch
-Patch26020: psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch
-
 #rhbz 1089731
 Patch26058: asus-nb-wmi-Add-wapf4-quirk-for-the-X550VB.patch
 
 #rhbz 1135338
 Patch26090: HID-add-support-for-MS-Surface-Pro-3-Type-Cover.patch
 
-#rhbz 1164945
-Patch26092: xhci-Add-broken-streams-quirk-for-Fresco-Logic-FL100.patch
-Patch26093: uas-Add-US_FL_NO_ATA_1X-for-Seagate-devices-with-usb.patch
-Patch26094: uas-Add-US_FL_NO_REPORT_OPCODES-for-JMicron-JMS566-w.patch
-
-#rhbz 1172543
-Patch26096: cfg80211-don-t-WARN-about-two-consecutive-Country-IE.patch
-
 #rhbz 1173806
 Patch26101: powerpc-powernv-force-all-CPUs-to-be-bootable.patch
 
-#CVE-2014-8559 rhbz 1159313 1173814
-Patch26098: move-d_rcu-from-overlapping-d_child-to-overlapping-d.patch
-Patch26099: deal-with-deadlock-in-d_walk.patch
-
-#rhbz 1175261
-Patch26103: blk-mq-Fix-uninitialized-kobject-at-CPU-hotplugging.patch
-
 #rhbz 1163927
 Patch26121: Set-UID-in-sess_auth_rawntlmssp_authenticate-too.patch
 
-#CVE-2014-9428 rhbz 1178826,1178833
-Patch26122: batman-adv-Calculate-extra-tail-size-based-on-queued.patch
-
 #CVE-2014-9529 rhbz 1179813 1179853
 Patch26124: KEYS-close-race-between-key-lookup-and-freeing.patch
 
-#rhbz 1178975
-Patch26125: x86-vdso-Use-asm-volatile-in-__getcpu.patch
-
 #rhbz 1124119
 Patch26126: uas-Do-not-blacklist-ASM1153-disk-enclosures.patch
 Patch26127: uas-Add-US_FL_NO_ATA_1X-for-2-more-Seagate-disk-encl.patch
@@ -780,15 +747,16 @@ Patch26130: acpi-video-Add-disable_native_backlight-quirk-for-De.patch
 #rhbz 1094948
 Patch26131: acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch
 
-#CVE-2014-9585 rhbz 1181054 1181056
-Patch26132: x86_64-vdso-Fix-the-vdso-address-randomization-algor.patch
-
-#CVE-2014-8160 rhbz 1182059 1182063
-Patch26133: netfilter-conntrack-disable-generic-tracking-for-kno.patch
-
 # git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
 Patch30000: kernel-arm64.patch
 
+# Fix for big-endian arches, already upstream
+Patch30001: mpssd-x86-only.patch
+
+#CVE-2015-0239 rhbz 1186448 1186453
+Patch30004: KVM-x86-SYSENTER-emulation-is-broken.patch
+
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1334,7 +1302,6 @@ ApplyOptionalPatch upstream-reverts.patch -R
 ApplyPatch lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
 
 # PPC
-ApplyPatch ppc64-fixtools.patch
 
 # ARM64
 
@@ -1473,57 +1440,24 @@ ApplyPatch criu-no-expert.patch
 #rhbz 892811
 ApplyPatch ath9k-rx-dma-stop-check.patch
 
-#rhbz 1025603
-ApplyPatch disable-libdw-unwind-on-non-x86.patch
-
-ApplyPatch perf-install-trace-event-plugins.patch
-
 # Patch series from Hans for various backlight and platform driver fixes
 ApplyPatch samsung-laptop-Add-broken-acpi-video-quirk-for-NC210.patch
 
-#rhbz 1134969
-ApplyPatch HID-wacom-Add-support-for-the-Cintiq-Companion.patch
-
-#rhbz 1110011
-ApplyPatch psmouse-Add-psmouse_matches_pnp_id-helper-function.patch
-ApplyPatch psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch
-
 #rhbz 1089731
 ApplyPatch asus-nb-wmi-Add-wapf4-quirk-for-the-X550VB.patch
 
 #rhbz 1135338
 ApplyPatch HID-add-support-for-MS-Surface-Pro-3-Type-Cover.patch
 
-#rhbz 1164945
-ApplyPatch xhci-Add-broken-streams-quirk-for-Fresco-Logic-FL100.patch
-ApplyPatch uas-Add-US_FL_NO_ATA_1X-for-Seagate-devices-with-usb.patch
-ApplyPatch uas-Add-US_FL_NO_REPORT_OPCODES-for-JMicron-JMS566-w.patch
-
-#rhbz 1172543
-ApplyPatch cfg80211-don-t-WARN-about-two-consecutive-Country-IE.patch
-
 #rhbz 1173806
 ApplyPatch powerpc-powernv-force-all-CPUs-to-be-bootable.patch
 
-#CVE-2014-8559 rhbz 1159313 1173814
-ApplyPatch move-d_rcu-from-overlapping-d_child-to-overlapping-d.patch
-ApplyPatch deal-with-deadlock-in-d_walk.patch
-
-#rhbz 1175261
-ApplyPatch blk-mq-Fix-uninitialized-kobject-at-CPU-hotplugging.patch
-
 #rhbz 1163927
 ApplyPatch Set-UID-in-sess_auth_rawntlmssp_authenticate-too.patch
 
-#CVE-2014-9428 rhbz 1178826,1178833
-ApplyPatch batman-adv-Calculate-extra-tail-size-based-on-queued.patch
-
 #CVE-2014-9529 rhbz 1179813 1179853
 ApplyPatch KEYS-close-race-between-key-lookup-and-freeing.patch
 
-#rhbz 1178975
-ApplyPatch x86-vdso-Use-asm-volatile-in-__getcpu.patch
-
 #rhbz 1124119
 ApplyPatch uas-Do-not-blacklist-ASM1153-disk-enclosures.patch
 ApplyPatch uas-Add-US_FL_NO_ATA_1X-for-2-more-Seagate-disk-encl.patch
@@ -1536,11 +1470,11 @@ ApplyPatch acpi-video-Add-disable_native_backlight-quirk-for-De.patch
 #rhbz 1094948
 ApplyPatch acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch
 
-#CVE-2014-9585 rhbz 1181054 1181056
-ApplyPatch x86_64-vdso-Fix-the-vdso-address-randomization-algor.patch
+# Fix for big-endian arches, already upstream
+ApplyPatch mpssd-x86-only.patch
 
-#CVE-2014-8160 rhbz 1182059 1182063
-ApplyPatch netfilter-conntrack-disable-generic-tracking-for-kno.patch
+#CVE-2015-0239 rhbz 1186448 1186453
+ApplyPatch KVM-x86-SYSENTER-emulation-is-broken.patch
 
 %if 0%{?aarch64patches}
 ApplyPatch kernel-arm64.patch
@@ -2360,6 +2294,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Wed Jan 28 2015 Justin M. Forbes <jforbes at fedoraproject.org> - 3.18.4-100
+- Linux v3.18.4
+
 * Thu Jan 15 2015 Josh Boyer <jwboyer at fedoraproject.org> - 3.17.8-201
 - CVE-2014-8160 iptables restriction bypass (rhbz 1182059 1182063)
 
diff --git a/mpssd-x86-only.patch b/mpssd-x86-only.patch
new file mode 100644
index 0000000..862603d
--- /dev/null
+++ b/mpssd-x86-only.patch
@@ -0,0 +1,27 @@
+commit d47fb4ec7e101a63754939fa49d75fd7e81e94f8
+Author: Ashutosh Dixit <ashutosh.dixit at intel.com>
+Date:   Thu Dec 4 13:27:29 2014 -0800
+
+    Documentation: Build mic/mpssd only for x86_64
+    
+    mic/mpssd along with MIC drivers are currently only usable on
+    x86_64. So build mic/mpssd only for x86_64 to avoid build breaks on
+    big-endian systems.
+    
+    Reported-by: Daniel Borkmann <dborkman at redhat.com>
+    Reported-by: Dan Streetman <ddstreet at gmail.com>
+    Suggested-by: Peter Foley <pefoley2 at pefoley.com>
+    Signed-off-by: Ashutosh Dixit <ashutosh.dixit at intel.com>
+    Signed-off-by: Jonathan Corbet <corbet at lwn.net>
+
+diff --git a/Documentation/mic/mpssd/Makefile b/Documentation/mic/mpssd/Makefile
+index 0f31568..f47fe6b 100644
+--- a/Documentation/mic/mpssd/Makefile
++++ b/Documentation/mic/mpssd/Makefile
+@@ -1,5 +1,5 @@
+ # List of programs to build
+-hostprogs-y := mpssd
++hostprogs-$(CONFIG_X86_64) := mpssd
+
+ mpssd-objs := mpssd.o sysfs.o
+
diff --git a/sources b/sources
index 35129af..9b63a7f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-fb30d0f29214d75cddd2faa94f73d5cf  linux-3.17.tar.xz
-159e969cbc27201d8e2fa0f609dc722f  perf-man-3.17.tar.gz
-4ea1c0e18b18406bcd248bf06b95aec3  patch-3.17.8.xz
+9e854df51ca3fef8bfe566dbd7b89241  linux-3.18.tar.xz
+813ccb96f0b379d656e57442c2587ca3  perf-man-3.18.tar.gz
+e7c510c0df50abb2cbaea2a1a87f35b7  patch-3.18.4.xz


More information about the scm-commits mailing list