@@ -402,7 +402,7 @@ CONFIG_SWIOTLB=y

 CONFIG_IOMMU_HELPER=y

 # CONFIG_MAXSMP is not set

 CONFIG_NR_CPUS=32

-CONFIG_SCHED_SMT=y

+# CONFIG_SCHED_SMT is not set

 CONFIG_SCHED_MC=y

 CONFIG_PREEMPT_NONE=y

 # CONFIG_PREEMPT_VOLUNTARY is not set

@@ -567,7 +567,6 @@ CONFIG_PCI_DIRECT=y

 CONFIG_PCI_DOMAINS=y

 # CONFIG_PCI_CNB20LE_QUIRK is not set

 CONFIG_PCIEPORTBUS=y

-CONFIG_HOTPLUG_PCI_PCIE=y

 # CONFIG_PCIEAER is not set

 # CONFIG_PCIEASPM is not set

 CONFIG_PCI_BUS_ADDR_T_64BIT=y

@@ -587,10 +586,7 @@ CONFIG_PCI_LABEL=y

 #

 # CONFIG_ISA_DMA_API is not set

 # CONFIG_PCCARD is not set

-CONFIG_HOTPLUG_PCI=y

-# CONFIG_HOTPLUG_PCI_ACPI is not set

-# CONFIG_HOTPLUG_PCI_CPCI is not set

-# CONFIG_HOTPLUG_PCI_SHPC is not set

+# CONFIG_HOTPLUG_PCI is not set

 # CONFIG_RAPIDIO is not set

 # CONFIG_X86_SYSFB is not set

@@ -1148,7 +1144,7 @@ CONFIG_BLK_DEV_RAM_DAX=y

 # CONFIG_SENSORS_APDS990X is not set

 # CONFIG_HMC6352 is not set

 # CONFIG_DS1682 is not set

-CONFIG_VMWARE_BALLOON=m

+CONFIG_VMWARE_BALLOON=y

 # CONFIG_BMP085_I2C is not set

 # CONFIG_USB_SWITCH_FSA9480 is not set

 # CONFIG_SRAM is not set

@@ -1172,7 +1168,7 @@ CONFIG_VMWARE_BALLOON=m

 # Altera FPGA firmware download module

 #

 # CONFIG_ALTERA_STAPL is not set

-CONFIG_VMWARE_VMCI=m

+CONFIG_VMWARE_VMCI=y

 #

 # Intel MIC Bus Driver

@@ -1861,7 +1857,7 @@ CONFIG_FB_DEFERRED_IO=y

 # CONFIG_FB_VGA16 is not set

 # CONFIG_FB_UVESA is not set

 CONFIG_FB_VESA=y

-# CONFIG_FB_EFI is not set

+CONFIG_FB_EFI=y

 # CONFIG_FB_N411 is not set

 # CONFIG_FB_HGA is not set

 # CONFIG_FB_OPENCORES is not set

@@ -2302,7 +2298,7 @@ CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y

 #

 # EFI (Extensible Firmware Interface) Support

 #

-# CONFIG_EFI_VARS is not set

+CONFIG_EFI_VARS=m

 CONFIG_EFI_ESRT=y

 CONFIG_EFI_RUNTIME_WRAPPERS=y

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

 Summary:        Kernel

 Name:        linux-esx

 Version:    4.2.0

-Release:    2%{?dist}

+Release:    3%{?dist}

 License:    GPLv2

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

 Group:        System Environment/Kernel

@@ -92,7 +92,7 @@ cp -r Documentation/*        %{buildroot}%{_defaultdocdir}/linux-esx-%{version}

 cat > %{buildroot}/boot/%{name}-%{version}-%{release}.cfg << "EOF"

 # GRUB Environment Block

-photon_cmdline=init=/lib/systemd/systemd tsc=reliable no_timer_check rcupdate.rcu_expedited=1 rootfstype=ext4 rw systemd.show_status=0 elevator=noop cpu_init_udelay=0 quiet

+photon_cmdline=init=/lib/systemd/systemd tsc=reliable no_timer_check rcupdate.rcu_expedited=1 rootfstype=ext4 rw systemd.show_status=0 elevator=noop quiet nordrand noreplace-smp cpu_init_udelay=0 noacpi acpi=off noapic pci=conf1,nodomains pcie_acpm=off pnpacpi=off

 photon_linux=/boot/vmlinuz-esx-%{version}

 EOF

@@ -120,10 +120,15 @@ ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg

 /lib/modules/%{version}-esx/build

 %changelog

-*   Fri Sep 4 2015 Alexey Makhalov <amakhalov@vmware.com> 4.2-2

+*   Thu Sep 17 2015 Alexey Makhalov <amakhalov@vmware.com> 4.2.0-3

+-   More cmdline options to boot up faster (one of the is disable acpi).

+-   Compile out: pci hotplug, sched smt.

+-   Compile in kernel: vmware balloon & vmci, efi fb.

+-   Module for efi vars.

+*   Fri Sep 4 2015 Alexey Makhalov <amakhalov@vmware.com> 4.2.0-2

 -   Hardcoded poweroff (direct write to piix4), no ACPI is required.

 -   sd.c: Lower log level for "Assuming drive cache..." message.

-*   Tue Sep 1 2015 Alexey Makhalov <amakhalov@vmware.com> 4.2-1

+*   Tue Sep 1 2015 Alexey Makhalov <amakhalov@vmware.com> 4.2.0-1

 -   Update to linux-4.2.0. Enable CONFIG_EFI

 *   Fri Aug 28 2015 Alexey Makhalov <amakhalov@vmware.com> 4.1.3-5

 -   Added MD/LVM/DM modules.