@@ -172,7 +172,7 @@ CONFIG_CGROUP_DEVICE=y

 CONFIG_CGROUP_CPUACCT=y

 CONFIG_CGROUP_PERF=y

 # CONFIG_CGROUP_DEBUG is not set

-CONFIG_CHECKPOINT_RESTORE=y

+# CONFIG_CHECKPOINT_RESTORE is not set

 CONFIG_NAMESPACES=y

 CONFIG_UTS_NS=y

 CONFIG_IPC_NS=y

@@ -609,7 +609,7 @@ CONFIG_LEGACY_VSYSCALL_EMULATE=y

 # CONFIG_CMDLINE_BOOL is not set

 # CONFIG_MODIFY_LDT_SYSCALL is not set

 CONFIG_HAVE_LIVEPATCH=y

-CONFIG_LIVEPATCH=y

+# CONFIG_LIVEPATCH is not set

 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y

 CONFIG_USE_PERCPU_NUMA_NODE_ID=y

@@ -641,7 +641,7 @@ CONFIG_ACPI_PROCFS_POWER=y

 CONFIG_ACPI_AC=m

 CONFIG_ACPI_BATTERY=m

 CONFIG_ACPI_BUTTON=m

-# CONFIG_ACPI_VIDEO is not set

+CONFIG_ACPI_VIDEO=m

 # CONFIG_ACPI_FAN is not set

 # CONFIG_ACPI_DOCK is not set

 CONFIG_ACPI_CPU_FREQ_PSS=y

@@ -1459,7 +1459,7 @@ CONFIG_SYS_HYPERVISOR=y

 CONFIG_GENERIC_CPU_AUTOPROBE=y

 CONFIG_GENERIC_CPU_VULNERABILITIES=y

 CONFIG_REGMAP=y

-CONFIG_REGMAP_I2C=m

+CONFIG_REGMAP_I2C=y

 CONFIG_DMA_SHARED_BUFFER=y

 # CONFIG_FENCE_TRACE is not set

@@ -2126,7 +2126,6 @@ CONFIG_INPUT_MISC=y

 # CONFIG_INPUT_AD714X is not set

 # CONFIG_INPUT_BMA150 is not set

 # CONFIG_INPUT_E3X0_BUTTON is not set

-CONFIG_INPUT_PCSPKR=m

 # CONFIG_INPUT_MMA8450 is not set

 # CONFIG_INPUT_MPU3050 is not set

 # CONFIG_INPUT_ATLAS_BTNS is not set

@@ -2260,13 +2259,14 @@ CONFIG_DEVPORT=y

 #

 # I2C support

 #

-CONFIG_I2C=m

+CONFIG_I2C=y

+# CONFIG_ACPI_I2C_OPREGION is not set

 CONFIG_I2C_BOARDINFO=y

 CONFIG_I2C_COMPAT=y

 # CONFIG_I2C_CHARDEV is not set

 # CONFIG_I2C_MUX is not set

 CONFIG_I2C_HELPER_AUTO=y

-CONFIG_I2C_ALGOBIT=m

+CONFIG_I2C_ALGOBIT=y

 #

 # I2C Hardware Bus support

@@ -2503,6 +2503,7 @@ CONFIG_SENSORS_DELL_SMM=m

 CONFIG_SENSORS_ACPI_POWER=m

 # CONFIG_SENSORS_ATK0110 is not set

 CONFIG_THERMAL=y

+CONFIG_THERMAL_HWMON=y

 CONFIG_THERMAL_WRITABLE_TRIPS=y

 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y

 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set

@@ -2549,9 +2550,14 @@ CONFIG_BCMA_POSSIBLE=y

 # Multifunction device drivers

 #

 CONFIG_MFD_CORE=m

+# CONFIG_MFD_AS3711 is not set

+# CONFIG_PMIC_ADP5520 is not set

 # CONFIG_MFD_BCM590XX is not set

 # CONFIG_MFD_AXP20X_I2C is not set

 # CONFIG_MFD_CROS_EC is not set

+# CONFIG_PMIC_DA903X is not set

+# CONFIG_MFD_DA9052_I2C is not set

+# CONFIG_MFD_DA9055 is not set

 # CONFIG_MFD_DA9062 is not set

 # CONFIG_MFD_DA9063 is not set

 # CONFIG_MFD_DA9150 is not set

@@ -2566,9 +2572,14 @@ CONFIG_LPC_SCH=m

 # CONFIG_MFD_KEMPLD is not set

 # CONFIG_MFD_88PM800 is not set

 # CONFIG_MFD_88PM805 is not set

+# CONFIG_MFD_88PM860X is not set

 # CONFIG_MFD_MAX14577 is not set

 # CONFIG_MFD_MAX77693 is not set

+# CONFIG_MFD_MAX77843 is not set

 # CONFIG_MFD_MAX8907 is not set

+# CONFIG_MFD_MAX8925 is not set

+# CONFIG_MFD_MAX8997 is not set

+# CONFIG_MFD_MAX8998 is not set

 # CONFIG_MFD_MT6397 is not set

 # CONFIG_MFD_MENF21BMC is not set

 # CONFIG_MFD_RETU is not set

@@ -2576,25 +2587,38 @@ CONFIG_LPC_SCH=m

 # CONFIG_MFD_RDC321X is not set

 # CONFIG_MFD_RTSX_PCI is not set

 # CONFIG_MFD_RT5033 is not set

+# CONFIG_MFD_RC5T583 is not set

+# CONFIG_MFD_SEC_CORE is not set

 # CONFIG_MFD_SI476X_CORE is not set

 # CONFIG_MFD_SM501 is not set

 # CONFIG_MFD_SKY81452 is not set

+# CONFIG_MFD_SMSC is not set

 # CONFIG_ABX500_CORE is not set

 # CONFIG_MFD_SYSCON is not set

 # CONFIG_MFD_TI_AM335X_TSCADC is not set

 # CONFIG_MFD_LP3943 is not set

+# CONFIG_MFD_LP8788 is not set

+# CONFIG_MFD_PALMAS is not set

 # CONFIG_TPS6105X is not set

 # CONFIG_TPS6507X is not set

 # CONFIG_MFD_TPS65086 is not set

+# CONFIG_MFD_TPS65090 is not set

 # CONFIG_MFD_TPS65217 is not set

 # CONFIG_MFD_TI_LP873X is not set

 # CONFIG_MFD_TPS65218 is not set

+# CONFIG_MFD_TPS6586X is not set

 # CONFIG_MFD_TPS65912_I2C is not set

+# CONFIG_MFD_TPS80031 is not set

+# CONFIG_TWL4030_CORE is not set

+# CONFIG_TWL6040_CORE is not set

 # CONFIG_MFD_WL1273_CORE is not set

 # CONFIG_MFD_LM3533 is not set

 # CONFIG_MFD_TMIO is not set

 # CONFIG_MFD_VX855 is not set

 # CONFIG_MFD_ARIZONA_I2C is not set

+# CONFIG_MFD_WM8400 is not set

+# CONFIG_MFD_WM831X_I2C is not set

+# CONFIG_MFD_WM8350_I2C is not set

 # CONFIG_MFD_WM8994 is not set

 # CONFIG_REGULATOR is not set

 # CONFIG_MEDIA_SUPPORT is not set

@@ -2602,16 +2626,23 @@ CONFIG_LPC_SCH=m

 #

 # Graphics support

 #

-# CONFIG_AGP is not set

+CONFIG_AGP=y

+# CONFIG_AGP_AMD64 is not set

+CONFIG_AGP_INTEL=m

+# CONFIG_AGP_SIS is not set

+# CONFIG_AGP_VIA is not set

+CONFIG_INTEL_GTT=m

 CONFIG_VGA_ARB=y

 CONFIG_VGA_ARB_MAX_GPUS=16

 # CONFIG_VGA_SWITCHEROO is not set

-CONFIG_DRM=m

+CONFIG_DRM=y

+CONFIG_DRM_MIPI_DSI=y

 # CONFIG_DRM_DP_AUX_CHARDEV is not set

-CONFIG_DRM_KMS_HELPER=m

+CONFIG_DRM_KMS_HELPER=y

 CONFIG_DRM_KMS_FB_HELPER=y

 CONFIG_DRM_FBDEV_EMULATION=y

 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set

+CONFIG_DRM_TTM=y

 #

 # I2C encoder or helper chips

@@ -2619,23 +2650,42 @@ CONFIG_DRM_FBDEV_EMULATION=y

 # CONFIG_DRM_I2C_CH7006 is not set

 # CONFIG_DRM_I2C_SIL164 is not set

 # CONFIG_DRM_I2C_NXP_TDA998X is not set

-# CONFIG_DRM_RADEON is not set

+CONFIG_DRM_RADEON=m

+# CONFIG_DRM_RADEON_USERPTR is not set

 # CONFIG_DRM_AMDGPU is not set

 #

 # ACP (Audio CoProcessor) Configuration

 #

-# CONFIG_DRM_NOUVEAU is not set

-# CONFIG_DRM_I915 is not set

+CONFIG_DRM_NOUVEAU=m

+CONFIG_NOUVEAU_DEBUG=5

+CONFIG_NOUVEAU_DEBUG_DEFAULT=3

+CONFIG_DRM_NOUVEAU_BACKLIGHT=y

+CONFIG_DRM_I915=m

+# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set

+CONFIG_DRM_I915_USERPTR=y

+# CONFIG_DRM_I915_GVT is not set

+

+#

+# drm/i915 Debugging

+#

+# CONFIG_DRM_I915_WERROR is not set

+# CONFIG_DRM_I915_DEBUG is not set

 # CONFIG_DRM_VGEM is not set

-# CONFIG_DRM_VMWGFX is not set

+CONFIG_DRM_VMWGFX=y

+CONFIG_DRM_VMWGFX_FBCON=y

 # CONFIG_DRM_GMA500 is not set

 # CONFIG_DRM_AST is not set

 # CONFIG_DRM_MGAG200 is not set

-# CONFIG_DRM_CIRRUS_QEMU is not set

+CONFIG_DRM_CIRRUS_QEMU=m

 # CONFIG_DRM_QXL is not set

 # CONFIG_DRM_BOCHS is not set

 # CONFIG_DRM_VIRTIO_GPU is not set

+CONFIG_DRM_PANEL=y

+

+#

+# Display Panels

+#

 CONFIG_DRM_BRIDGE=y

 #

@@ -2647,47 +2697,57 @@ CONFIG_DRM_BRIDGE=y

 #

 # Frame buffer Devices

 #

-CONFIG_FB=m

+CONFIG_FB=y

 # CONFIG_FIRMWARE_EDID is not set

 CONFIG_FB_CMDLINE=y

 CONFIG_FB_NOTIFY=y

-# CONFIG_FB_DDC is not set

-# CONFIG_FB_BOOT_VESA_SUPPORT is not set

-CONFIG_FB_CFB_FILLRECT=m

-CONFIG_FB_CFB_COPYAREA=m

-CONFIG_FB_CFB_IMAGEBLIT=m

+CONFIG_FB_DDC=m

+CONFIG_FB_BOOT_VESA_SUPPORT=y

+CONFIG_FB_CFB_FILLRECT=y

+CONFIG_FB_CFB_COPYAREA=y

+CONFIG_FB_CFB_IMAGEBLIT=y

 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set

-CONFIG_FB_SYS_FILLRECT=m

-CONFIG_FB_SYS_COPYAREA=m

-CONFIG_FB_SYS_IMAGEBLIT=m

+CONFIG_FB_SYS_FILLRECT=y

+CONFIG_FB_SYS_COPYAREA=y

+CONFIG_FB_SYS_IMAGEBLIT=y

 # CONFIG_FB_FOREIGN_ENDIAN is not set

-CONFIG_FB_SYS_FOPS=m

+CONFIG_FB_SYS_FOPS=y

 CONFIG_FB_DEFERRED_IO=y

 # CONFIG_FB_SVGALIB is not set

 # CONFIG_FB_MACMODES is not set

-# CONFIG_FB_BACKLIGHT is not set

-# CONFIG_FB_MODE_HELPERS is not set

+CONFIG_FB_BACKLIGHT=y

+CONFIG_FB_MODE_HELPERS=y

 # CONFIG_FB_TILEBLITTING is not set

 #

 # Frame buffer hardware drivers

 #

-# CONFIG_FB_CIRRUS is not set

+CONFIG_FB_CIRRUS=m

 # CONFIG_FB_PM2 is not set

 # CONFIG_FB_CYBER2000 is not set

 # CONFIG_FB_ARC is not set

+# CONFIG_FB_ASILIANT is not set

+# CONFIG_FB_IMSTT is not set

 # CONFIG_FB_VGA16 is not set

 # CONFIG_FB_UVESA is not set

+CONFIG_FB_VESA=y

 # CONFIG_FB_N411 is not set

 # CONFIG_FB_HGA is not set

 # CONFIG_FB_OPENCORES is not set

 # CONFIG_FB_S1D13XXX is not set

-# CONFIG_FB_NVIDIA is not set

+CONFIG_FB_NVIDIA=m

+# CONFIG_FB_NVIDIA_I2C is not set

+# CONFIG_FB_NVIDIA_DEBUG is not set

+CONFIG_FB_NVIDIA_BACKLIGHT=y

 # CONFIG_FB_RIVA is not set

-# CONFIG_FB_I740 is not set

+CONFIG_FB_I740=m

 # CONFIG_FB_LE80578 is not set

+# CONFIG_FB_INTEL is not set

 # CONFIG_FB_MATROX is not set

-# CONFIG_FB_RADEON is not set

+CONFIG_FB_RADEON=m

+CONFIG_FB_RADEON_I2C=y

+CONFIG_FB_RADEON_BACKLIGHT=y

+# CONFIG_FB_RADEON_DEBUG is not set

 # CONFIG_FB_ATY128 is not set

 # CONFIG_FB_ATY is not set

 # CONFIG_FB_S3 is not set

@@ -2704,18 +2764,18 @@ CONFIG_FB_DEFERRED_IO=y

 # CONFIG_FB_CARMINE is not set

 # CONFIG_FB_IBM_GXT4500 is not set

 # CONFIG_FB_VIRTUAL is not set

-# CONFIG_XEN_FBDEV_FRONTEND is not set

+CONFIG_XEN_FBDEV_FRONTEND=m

 # CONFIG_FB_METRONOME is not set

 # CONFIG_FB_MB862XX is not set

 # CONFIG_FB_BROADSHEET is not set

 # CONFIG_FB_AUO_K190X is not set

-# CONFIG_FB_HYPERV is not set

+CONFIG_FB_HYPERV=m

+# CONFIG_FB_SIMPLE is not set

 # CONFIG_FB_SM712 is not set

 CONFIG_BACKLIGHT_LCD_SUPPORT=y

-CONFIG_LCD_CLASS_DEVICE=m

-# CONFIG_LCD_PLATFORM is not set

-CONFIG_BACKLIGHT_CLASS_DEVICE=m

-CONFIG_BACKLIGHT_GENERIC=m

+# CONFIG_LCD_CLASS_DEVICE is not set

+CONFIG_BACKLIGHT_CLASS_DEVICE=y

+CONFIG_BACKLIGHT_GENERIC=y

 # CONFIG_BACKLIGHT_APPLE is not set

 # CONFIG_BACKLIGHT_PM8941_WLED is not set

 # CONFIG_BACKLIGHT_SAHARA is not set

@@ -2724,18 +2784,21 @@ CONFIG_BACKLIGHT_GENERIC=m

 # CONFIG_BACKLIGHT_LM3639 is not set

 # CONFIG_BACKLIGHT_LV5207LP is not set

 # CONFIG_BACKLIGHT_BD6107 is not set

-# CONFIG_VGASTATE is not set

+CONFIG_VGASTATE=m

 CONFIG_HDMI=y

 #

 # Console display driver support

 #

 CONFIG_VGA_CONSOLE=y

-# CONFIG_VGACON_SOFT_SCROLLBACK is not set

+CONFIG_VGACON_SOFT_SCROLLBACK=y

+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64

 CONFIG_DUMMY_CONSOLE=y

 CONFIG_DUMMY_CONSOLE_COLUMNS=80

 CONFIG_DUMMY_CONSOLE_ROWS=25

-# CONFIG_FRAMEBUFFER_CONSOLE is not set

+CONFIG_FRAMEBUFFER_CONSOLE=y

+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y

 # CONFIG_LOGO is not set

 CONFIG_SOUND=m

 # CONFIG_SOUND_OSS_CORE is not set

@@ -2861,6 +2924,7 @@ CONFIG_SND_HDA_INTEL=m

 # CONFIG_SND_HDA_GENERIC is not set

 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0

 CONFIG_SND_HDA_CORE=m

+CONFIG_SND_HDA_I915=y

 CONFIG_SND_HDA_PREALLOC_SIZE=64

 # CONFIG_SND_SOC is not set

 # CONFIG_SOUND_PRIME is not set

@@ -3023,7 +3087,7 @@ CONFIG_RTC_INTF_DEV=y

 #

 # SPI RTC drivers

 #

-CONFIG_RTC_I2C_AND_SPI=m

+CONFIG_RTC_I2C_AND_SPI=y

 #

 # SPI and I2C RTC drivers

@@ -3180,24 +3244,30 @@ CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192

 # CONFIG_MOST is not set

 # CONFIG_GREYBUS is not set

 CONFIG_X86_PLATFORM_DEVICES=y

+# CONFIG_ACER_WMI is not set

 # CONFIG_ACERHDF is not set

 # CONFIG_ASUS_LAPTOP is not set

 # CONFIG_DELL_SMBIOS is not set

+# CONFIG_DELL_WMI_AIO is not set

 # CONFIG_DELL_SMO8800 is not set

 # CONFIG_FUJITSU_LAPTOP is not set

 # CONFIG_FUJITSU_TABLET is not set

 # CONFIG_HP_ACCEL is not set

 # CONFIG_HP_WIRELESS is not set

+# CONFIG_HP_WMI is not set

 # CONFIG_PANASONIC_LAPTOP is not set

 # CONFIG_THINKPAD_ACPI is not set

 # CONFIG_SENSORS_HDAPS is not set

 # CONFIG_INTEL_MENLOW is not set

 # CONFIG_EEEPC_LAPTOP is not set

+# CONFIG_ASUS_WMI is not set

 # CONFIG_ASUS_WIRELESS is not set

-# CONFIG_ACPI_WMI is not set

+CONFIG_ACPI_WMI=m

+# CONFIG_MSI_WMI is not set

 # CONFIG_TOPSTAR_LAPTOP is not set

 # CONFIG_TOSHIBA_BT_RFKILL is not set

 # CONFIG_TOSHIBA_HAPS is not set

+# CONFIG_TOSHIBA_WMI is not set

 # CONFIG_ACPI_CMPC is not set

 # CONFIG_INTEL_HID_EVENT is not set

 # CONFIG_INTEL_VBTN is not set

@@ -3205,6 +3275,7 @@ CONFIG_X86_PLATFORM_DEVICES=y

 # CONFIG_INTEL_PMC_CORE is not set

 # CONFIG_IBM_RTL is not set

 # CONFIG_SAMSUNG_LAPTOP is not set

+CONFIG_MXM_WMI=m

 # CONFIG_SAMSUNG_Q10 is not set

 # CONFIG_APPLE_GMUX is not set

 # CONFIG_INTEL_RST is not set

@@ -3908,21 +3979,7 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1

 CONFIG_INTEGRITY=y

 # CONFIG_INTEGRITY_SIGNATURE is not set

 CONFIG_INTEGRITY_AUDIT=y

-CONFIG_IMA=y

-CONFIG_IMA_MEASURE_PCR_IDX=10

-CONFIG_IMA_LSM_RULES=y

-# CONFIG_IMA_TEMPLATE is not set

-CONFIG_IMA_NG_TEMPLATE=y

-# CONFIG_IMA_SIG_TEMPLATE is not set

-CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng"

-CONFIG_IMA_DEFAULT_HASH_SHA1=y

-# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set

-# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set

-# CONFIG_IMA_DEFAULT_HASH_WP512 is not set

-CONFIG_IMA_DEFAULT_HASH="sha1"

-# CONFIG_IMA_WRITE_POLICY is not set

-# CONFIG_IMA_READ_POLICY is not set

-# CONFIG_IMA_APPRAISE is not set

+# CONFIG_IMA is not set

 # CONFIG_EVM is not set

 CONFIG_DEFAULT_SECURITY_SELINUX=y

 # CONFIG_DEFAULT_SECURITY_DAC is not set

@@ -4221,6 +4278,10 @@ CONFIG_CLZ_TAB=y

 CONFIG_IRQ_POLL=y

 CONFIG_MPILIB=y

 CONFIG_OID_REGISTRY=y

+CONFIG_FONT_SUPPORT=y

+# CONFIG_FONTS is not set

+CONFIG_FONT_8x8=y

+CONFIG_FONT_8x16=y

 # CONFIG_SG_SPLIT is not set

 CONFIG_SG_POOL=y

 CONFIG_ARCH_HAS_SG_CHAIN=y

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux-aws

 Version:        4.9.80

-Release:        3%{?kat_build:.%kat_build}%{?dist}

+Release:        4%{?kat_build:.%kat_build}%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

 Group:        	System Environment/Kernel

@@ -389,6 +389,7 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 /boot/vmlinuz-%{uname_r}

 %config(noreplace) /boot/%{name}-%{uname_r}.cfg

 %config %{_localstatedir}/lib/initramfs/kernel/%{uname_r}

+/lib/firmware/*

 %defattr(0644,root,root)

 /lib/modules/%{uname_r}/*

 %exclude /lib/modules/%{uname_r}/build

@@ -429,6 +430,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 /usr/share/doc/*

 %changelog

+*   Fri Mar 16 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.80-4

+-   Tweak config options to fix issues on AWS.

 *   Thu Mar 1 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.80-3

 -   Fix upgrade issue by removing 'Obsoletes: linux-dev'.

 *   Mon Feb 19 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.80-2

@@ -52,7 +52,7 @@ echo "Tunnel no" >> /etc/ssh/ssh_config

 echo "ServerAliveInterval 420" >> /etc/ssh/ssh_config

 sed -i 's/net.ifnames=0//' /boot/grub/grub.cfg

-sed -i 's/$photon_cmdline/init=\/lib\/systemd\/systemd loglevel=3 ro console=ttyS0 earlyprintk=ttyS0/' /boot/grub/grub.cfg

+sed -i 's/$photon_cmdline/init=\/lib\/systemd\/systemd loglevel=3 ro console=ttyS0 earlyprintk=ttyS0 nvme_core.io_timeout=4294967295/' /boot/grub/grub.cfg

 # Disable loading/unloading of modules

 #echo "kernel.modules_disabled = 1" > /etc/sysctl.d/modules_disabled.conf