23 files changed, 45 insertions, 303 deletions
diff --git a/1-2-kvm-vmx-Reinstate-support-for-CPUs-without-virtual-NMI.patch b/1-2-kvm-vmx-Reinstate-support-for-CPUs-without-virtual-NMI.patch
deleted file mode 100644
index ca079af42..000000000
--- a/1-2-kvm-vmx-Reinstate-support-for-CPUs-without-virtual-NMI.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-From patchwork Mon Nov  6 12:31:12 2017
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [1/2] kvm: vmx: Reinstate support for CPUs without virtual NMI
-From: Paolo Bonzini <pbonzini@redhat.com>
-X-Patchwork-Id: 10043403
-Message-Id: <1509971473-74491-2-git-send-email-pbonzini@redhat.com>
-To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
-Cc: rkrcmar@redhat.com, stable@vger.kernel.org
-Date: Mon,  6 Nov 2017 13:31:12 +0100
-
-This is more or less a revert of commit 2c82878b0cb3 ("KVM: VMX: require
-virtual NMI support", 2017-03-27); it turns out that Core 2 Duo machines
-only had virtual NMIs in some SKUs.
-
-The revert is not trivial because in the meanwhile there have been several
-fixes to nested NMI injection.  Therefore, the entire vNMI state is moved
-to struct loaded_vmcs.
-
-Another change compared to before the patch is a simplification here:
-
-       if (unlikely(!cpu_has_virtual_nmis() && vmx->soft_vnmi_blocked &&
-           !(is_guest_mode(vcpu) && nested_cpu_has_virtual_nmis(
-                                       get_vmcs12(vcpu))))) {
-
-The final condition here is always true (because nested_cpu_has_virtual_nmis
-is always false) and is removed.
-
-Fixes: 2c82878b0cb38fd516fd612c67852a6bbf282003
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1490803
-Cc: stable@vger.kernel.org
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
----
- arch/x86/kvm/vmx.c | 150 +++++++++++++++++++++++++++++++++++++----------------
- 1 file changed, 106 insertions(+), 44 deletions(-)
-
-diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
-index e6c8ffa84968..d6b3b12ae1e2 100644
---- a/arch/x86/kvm/vmx.c
-+++ b/arch/x86/kvm/vmx.c
-@@ -202,6 +202,10 @@ struct loaded_vmcs {
- 	bool nmi_known_unmasked;
- 	unsigned long vmcs_host_cr3;	/* May not match real cr3 */
- 	unsigned long vmcs_host_cr4;	/* May not match real cr4 */
-+	/* Support for vnmi-less CPUs */
-+	int soft_vnmi_blocked;
-+	ktime_t entry_time;
-+	s64 vnmi_blocked_time;
- 	struct list_head loaded_vmcss_on_cpu_link;
- };
- 
-@@ -1291,6 +1295,11 @@ static inline bool cpu_has_vmx_invpcid(void)
- 		SECONDARY_EXEC_ENABLE_INVPCID;
- }
- 
-+static inline bool cpu_has_virtual_nmis(void)
-+{
-+	return vmcs_config.pin_based_exec_ctrl & PIN_BASED_VIRTUAL_NMIS;
-+}
-+
- static inline bool cpu_has_vmx_wbinvd_exit(void)
- {
- 	return vmcs_config.cpu_based_2nd_exec_ctrl &
-@@ -1348,11 +1357,6 @@ static inline bool nested_cpu_has2(struct vmcs12 *vmcs12, u32 bit)
- 		(vmcs12->secondary_vm_exec_control & bit);
- }
- 
--static inline bool nested_cpu_has_virtual_nmis(struct vmcs12 *vmcs12)
--{
--	return vmcs12->pin_based_vm_exec_control & PIN_BASED_VIRTUAL_NMIS;
--}
--
- static inline bool nested_cpu_has_preemption_timer(struct vmcs12 *vmcs12)
- {
- 	return vmcs12->pin_based_vm_exec_control &
-@@ -3712,9 +3716,9 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf)
- 				&_vmexit_control) < 0)
- 		return -EIO;
- 
--	min = PIN_BASED_EXT_INTR_MASK | PIN_BASED_NMI_EXITING |
--		PIN_BASED_VIRTUAL_NMIS;
--	opt = PIN_BASED_POSTED_INTR | PIN_BASED_VMX_PREEMPTION_TIMER;
-+	min = PIN_BASED_EXT_INTR_MASK | PIN_BASED_NMI_EXITING;
-+	opt = PIN_BASED_VIRTUAL_NMIS | PIN_BASED_POSTED_INTR |
-+		 PIN_BASED_VMX_PREEMPTION_TIMER;
- 	if (adjust_vmx_controls(min, opt, MSR_IA32_VMX_PINBASED_CTLS,
- 				&_pin_based_exec_control) < 0)
- 		return -EIO;
-@@ -5669,7 +5673,8 @@ static void enable_irq_window(struct kvm_vcpu *vcpu)
- 
- static void enable_nmi_window(struct kvm_vcpu *vcpu)
- {
--	if (vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) & GUEST_INTR_STATE_STI) {
-+	if (!cpu_has_virtual_nmis() ||
-+	    vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) & GUEST_INTR_STATE_STI) {
- 		enable_irq_window(vcpu);
- 		return;
- 	}
-@@ -5709,6 +5714,19 @@ static void vmx_inject_nmi(struct kvm_vcpu *vcpu)
- {
- 	struct vcpu_vmx *vmx = to_vmx(vcpu);
- 
-+	if (!cpu_has_virtual_nmis()) {
-+		/*
-+		 * Tracking the NMI-blocked state in software is built upon
-+		 * finding the next open IRQ window. This, in turn, depends on
-+		 * well-behaving guests: They have to keep IRQs disabled at
-+		 * least as long as the NMI handler runs. Otherwise we may
-+		 * cause NMI nesting, maybe breaking the guest. But as this is
-+		 * highly unlikely, we can live with the residual risk.
-+		 */
-+		vmx->loaded_vmcs->soft_vnmi_blocked = 1;
-+		vmx->loaded_vmcs->vnmi_blocked_time = 0;
-+	}
-+
- 	++vcpu->stat.nmi_injections;
- 	vmx->loaded_vmcs->nmi_known_unmasked = false;
- 
-@@ -5727,6 +5745,8 @@ static bool vmx_get_nmi_mask(struct kvm_vcpu *vcpu)
- 	struct vcpu_vmx *vmx = to_vmx(vcpu);
- 	bool masked;
- 
-+	if (!cpu_has_virtual_nmis())
-+		return vmx->loaded_vmcs->soft_vnmi_blocked;
- 	if (vmx->loaded_vmcs->nmi_known_unmasked)
- 		return false;
- 	masked = vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) & GUEST_INTR_STATE_NMI;
-@@ -5738,13 +5758,20 @@ static void vmx_set_nmi_mask(struct kvm_vcpu *vcpu, bool masked)
- {
- 	struct vcpu_vmx *vmx = to_vmx(vcpu);
- 
--	vmx->loaded_vmcs->nmi_known_unmasked = !masked;
--	if (masked)
--		vmcs_set_bits(GUEST_INTERRUPTIBILITY_INFO,
--			      GUEST_INTR_STATE_NMI);
--	else
--		vmcs_clear_bits(GUEST_INTERRUPTIBILITY_INFO,
--				GUEST_INTR_STATE_NMI);
-+	if (!cpu_has_virtual_nmis()) {
-+		if (vmx->loaded_vmcs->soft_vnmi_blocked != masked) {
-+			vmx->loaded_vmcs->soft_vnmi_blocked = masked;
-+			vmx->loaded_vmcs->vnmi_blocked_time = 0;
-+		}
-+	} else {
-+		vmx->loaded_vmcs->nmi_known_unmasked = !masked;
-+		if (masked)
-+			vmcs_set_bits(GUEST_INTERRUPTIBILITY_INFO,
-+				      GUEST_INTR_STATE_NMI);
-+		else
-+			vmcs_clear_bits(GUEST_INTERRUPTIBILITY_INFO,
-+					GUEST_INTR_STATE_NMI);
-+	}
- }
- 
- static int vmx_nmi_allowed(struct kvm_vcpu *vcpu)
-@@ -5752,6 +5779,10 @@ static int vmx_nmi_allowed(struct kvm_vcpu *vcpu)
- 	if (to_vmx(vcpu)->nested.nested_run_pending)
- 		return 0;
- 
-+	if (!cpu_has_virtual_nmis() &&
-+	    to_vmx(vcpu)->loaded_vmcs->soft_vnmi_blocked)
-+		return 0;
-+
- 	return	!(vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) &
- 		  (GUEST_INTR_STATE_MOV_SS | GUEST_INTR_STATE_STI
- 		   | GUEST_INTR_STATE_NMI));
-@@ -6479,6 +6510,7 @@ static int handle_ept_violation(struct kvm_vcpu *vcpu)
- 	 * AAK134, BY25.
- 	 */
- 	if (!(to_vmx(vcpu)->idt_vectoring_info & VECTORING_INFO_VALID_MASK) &&
-+			cpu_has_virtual_nmis() &&
- 			(exit_qualification & INTR_INFO_UNBLOCK_NMI))
- 		vmcs_set_bits(GUEST_INTERRUPTIBILITY_INFO, GUEST_INTR_STATE_NMI);
- 
-@@ -6965,7 +6997,7 @@ static struct loaded_vmcs *nested_get_current_vmcs02(struct vcpu_vmx *vmx)
- 	}
- 
- 	/* Create a new VMCS */
--	item = kmalloc(sizeof(struct vmcs02_list), GFP_KERNEL);
-+	item = kzalloc(sizeof(struct vmcs02_list), GFP_KERNEL);
- 	if (!item)
- 		return NULL;
- 	item->vmcs02.vmcs = alloc_vmcs();
-@@ -7982,6 +8014,7 @@ static int handle_pml_full(struct kvm_vcpu *vcpu)
- 	 * "blocked by NMI" bit has to be set before next VM entry.
- 	 */
- 	if (!(to_vmx(vcpu)->idt_vectoring_info & VECTORING_INFO_VALID_MASK) &&
-+			cpu_has_virtual_nmis() &&
- 			(exit_qualification & INTR_INFO_UNBLOCK_NMI))
- 		vmcs_set_bits(GUEST_INTERRUPTIBILITY_INFO,
- 				GUEST_INTR_STATE_NMI);
-@@ -8826,6 +8859,25 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu)
- 		return 0;
- 	}
- 
-+	if (unlikely(!cpu_has_virtual_nmis() &&
-+		     vmx->loaded_vmcs->soft_vnmi_blocked)) {
-+		if (vmx_interrupt_allowed(vcpu)) {
-+			vmx->loaded_vmcs->soft_vnmi_blocked = 0;
-+		} else if (vmx->loaded_vmcs->vnmi_blocked_time > 1000000000LL &&
-+			   vcpu->arch.nmi_pending) {
-+			/*
-+			 * This CPU don't support us in finding the end of an
-+			 * NMI-blocked window if the guest runs with IRQs
-+			 * disabled. So we pull the trigger after 1 s of
-+			 * futile waiting, but inform the user about this.
-+			 */
-+			printk(KERN_WARNING "%s: Breaking out of NMI-blocked "
-+			       "state on VCPU %d after 1 s timeout\n",
-+			       __func__, vcpu->vcpu_id);
-+			vmx->loaded_vmcs->soft_vnmi_blocked = 0;
-+		}
-+	}
-+
- 	if (exit_reason < kvm_vmx_max_exit_handlers
- 	    && kvm_vmx_exit_handlers[exit_reason])
- 		return kvm_vmx_exit_handlers[exit_reason](vcpu);
-@@ -9108,33 +9160,38 @@ static void vmx_recover_nmi_blocking(struct vcpu_vmx *vmx)
- 
- 	idtv_info_valid = vmx->idt_vectoring_info & VECTORING_INFO_VALID_MASK;
- 
--	if (vmx->loaded_vmcs->nmi_known_unmasked)
--		return;
--	/*
--	 * Can't use vmx->exit_intr_info since we're not sure what
--	 * the exit reason is.
--	 */
--	exit_intr_info = vmcs_read32(VM_EXIT_INTR_INFO);
--	unblock_nmi = (exit_intr_info & INTR_INFO_UNBLOCK_NMI) != 0;
--	vector = exit_intr_info & INTR_INFO_VECTOR_MASK;
--	/*
--	 * SDM 3: 27.7.1.2 (September 2008)
--	 * Re-set bit "block by NMI" before VM entry if vmexit caused by
--	 * a guest IRET fault.
--	 * SDM 3: 23.2.2 (September 2008)
--	 * Bit 12 is undefined in any of the following cases:
--	 *  If the VM exit sets the valid bit in the IDT-vectoring
--	 *   information field.
--	 *  If the VM exit is due to a double fault.
--	 */
--	if ((exit_intr_info & INTR_INFO_VALID_MASK) && unblock_nmi &&
--	    vector != DF_VECTOR && !idtv_info_valid)
--		vmcs_set_bits(GUEST_INTERRUPTIBILITY_INFO,
--			      GUEST_INTR_STATE_NMI);
--	else
--		vmx->loaded_vmcs->nmi_known_unmasked =
--			!(vmcs_read32(GUEST_INTERRUPTIBILITY_INFO)
--			  & GUEST_INTR_STATE_NMI);
-+	if (cpu_has_virtual_nmis()) {
-+		if (vmx->loaded_vmcs->nmi_known_unmasked)
-+			return;
-+		/*
-+		 * Can't use vmx->exit_intr_info since we're not sure what
-+		 * the exit reason is.
-+		 */
-+		exit_intr_info = vmcs_read32(VM_EXIT_INTR_INFO);
-+		unblock_nmi = (exit_intr_info & INTR_INFO_UNBLOCK_NMI) != 0;
-+		vector = exit_intr_info & INTR_INFO_VECTOR_MASK;
-+		/*
-+		 * SDM 3: 27.7.1.2 (September 2008)
-+		 * Re-set bit "block by NMI" before VM entry if vmexit caused by
-+		 * a guest IRET fault.
-+		 * SDM 3: 23.2.2 (September 2008)
-+		 * Bit 12 is undefined in any of the following cases:
-+		 *  If the VM exit sets the valid bit in the IDT-vectoring
-+		 *   information field.
-+		 *  If the VM exit is due to a double fault.
-+		 */
-+		if ((exit_intr_info & INTR_INFO_VALID_MASK) && unblock_nmi &&
-+		    vector != DF_VECTOR && !idtv_info_valid)
-+			vmcs_set_bits(GUEST_INTERRUPTIBILITY_INFO,
-+				      GUEST_INTR_STATE_NMI);
-+		else
-+			vmx->loaded_vmcs->nmi_known_unmasked =
-+				!(vmcs_read32(GUEST_INTERRUPTIBILITY_INFO)
-+				  & GUEST_INTR_STATE_NMI);
-+	} else if (unlikely(vmx->loaded_vmcs->soft_vnmi_blocked))
-+		vmx->loaded_vmcs->vnmi_blocked_time +=
-+			ktime_to_ns(ktime_sub(ktime_get(),
-+					      vmx->loaded_vmcs->entry_time));
- }
- 
- static void __vmx_complete_interrupts(struct kvm_vcpu *vcpu,
-@@ -9251,6 +9308,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
- 	struct vcpu_vmx *vmx = to_vmx(vcpu);
- 	unsigned long debugctlmsr, cr3, cr4;
- 
-+	/* Record the guest's net vcpu time for enforced NMI injections. */
-+	if (unlikely(!cpu_has_virtual_nmis() &&
-+		     vmx->loaded_vmcs->soft_vnmi_blocked))
-+		vmx->loaded_vmcs->entry_time = ktime_get();
-+
- 	/* Don't enter VMX if guest state is invalid, let the exit handler
- 	   start emulation until we arrive back to a valid state */
- 	if (vmx->emulation_required)
diff --git a/configs/base-generic/CONFIG_MTD_SHARPSL_PARTS b/configs/base-generic/CONFIG_MTD_SHARPSL_PARTS
new file mode 100644
index 000000000..ca1894677
--- /dev/null
+++ b/configs/base-generic/CONFIG_MTD_SHARPSL_PARTS
@@ -0,0 +1 @@
+# CONFIG_MTD_SHARPSL_PARTS is not set
diff --git a/configs/base-generic/CONFIG_RTC_DRV_PCF85363 b/configs/base-generic/CONFIG_RTC_DRV_PCF85363
new file mode 100644
index 000000000..115d491a4
--- /dev/null
+++ b/configs/base-generic/CONFIG_RTC_DRV_PCF85363
@@ -0,0 +1 @@
+# CONFIG_RTC_DRV_PCF85363 is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 7e1b3eb24..8edf1fea5 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -3325,6 +3325,7 @@ CONFIG_MTD_PHYSMAP_OF_VERSATILE=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
+# CONFIG_MTD_SHARPSL_PARTS is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_SST25L is not set
@@ -4607,6 +4608,7 @@ CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
+# CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 # CONFIG_RTC_DRV_PL030 is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 20ae5f7f3..8759ce2de 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -3304,6 +3304,7 @@ CONFIG_MTD_PHYSMAP_OF_VERSATILE=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
+# CONFIG_MTD_SHARPSL_PARTS is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_SST25L is not set
@@ -4585,6 +4586,7 @@ CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
+# CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 # CONFIG_RTC_DRV_PL030 is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 4f4cce161..f5b7a851d 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -3562,6 +3562,7 @@ CONFIG_MTD_PHYSMAP_OF_VERSATILE=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
+# CONFIG_MTD_SHARPSL_PARTS is not set
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MTD_SPINAND_MT29F=m
 CONFIG_MTD_SPINAND_ONDIEECC=y
@@ -4954,6 +4955,7 @@ CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
+# CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PL030=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 6779bfd1b..1c13c575f 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -3390,6 +3390,7 @@ CONFIG_MTD_PHYSMAP_OF_VERSATILE=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
+# CONFIG_MTD_SHARPSL_PARTS is not set
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MTD_SPINAND_MT29F=m
 CONFIG_MTD_SPINAND_ONDIEECC=y
@@ -4652,6 +4653,7 @@ CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
+# CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PL030=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 5bb5c3d29..3f4aab2ce 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3369,6 +3369,7 @@ CONFIG_MTD_PHYSMAP_OF_VERSATILE=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
+# CONFIG_MTD_SHARPSL_PARTS is not set
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MTD_SPINAND_MT29F=m
 CONFIG_MTD_SPINAND_ONDIEECC=y
@@ -4630,6 +4631,7 @@ CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
+# CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PL030=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index e20c0fd79..e38b5d1be 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -3541,6 +3541,7 @@ CONFIG_MTD_PHYSMAP_OF_VERSATILE=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
+# CONFIG_MTD_SHARPSL_PARTS is not set
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MTD_SPINAND_MT29F=m
 CONFIG_MTD_SPINAND_ONDIEECC=y
@@ -4932,6 +4933,7 @@ CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
+# CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PL030=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 079266b71..c679e8d23 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -3186,6 +3186,7 @@ CONFIG_MTD_PHYSMAP_OF=m
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
+# CONFIG_MTD_SHARPSL_PARTS is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_SST25L is not set
@@ -4316,6 +4317,7 @@ CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
+# CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PM8XXX=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index b722c7149..f41be3a5b 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -3206,6 +3206,7 @@ CONFIG_MTD_PHYSMAP_OF=m
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
+# CONFIG_MTD_SHARPSL_PARTS is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_SST25L is not set
@@ -4337,6 +4338,7 @@ CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
+# CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PM8XXX=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index cc4812f0f..f13d6a775 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3206,6 +3206,7 @@ CONFIG_MTD_PHYSMAP_OF=m
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
+# CONFIG_MTD_SHARPSL_PARTS is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_SST25L is not set
@@ -4337,6 +4338,7 @@ CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
+# CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PM8XXX=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 3bbea9727..ad8f8f18e 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3186,6 +3186,7 @@ CONFIG_MTD_PHYSMAP_OF=m
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
+# CONFIG_MTD_SHARPSL_PARTS is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_SST25L is not set
@@ -4316,6 +4317,7 @@ CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
+# CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PM8XXX=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 16d9d3167..cb61226ac 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -3033,6 +3033,7 @@ CONFIG_MTD_POWERNV_FLASH=m
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
+# CONFIG_MTD_SHARPSL_PARTS is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_SST25L is not set
@@ -4149,6 +4150,7 @@ CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
+# CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PM8XXX=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 2778b32c9..9c6656d6e 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -3011,6 +3011,7 @@ CONFIG_MTD_POWERNV_FLASH=m
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
+# CONFIG_MTD_SHARPSL_PARTS is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_SST25L is not set
@@ -4126,6 +4127,7 @@ CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
+# CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PM8XXX=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index a15f58035..05a840847 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2977,6 +2977,7 @@ CONFIG_MTD_POWERNV_FLASH=m
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
+# CONFIG_MTD_SHARPSL_PARTS is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_SST25L is not set
@@ -4088,6 +4089,7 @@ CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
+# CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PM8XXX=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 300e0d972..aad60aa08 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2955,6 +2955,7 @@ CONFIG_MTD_POWERNV_FLASH=m
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
+# CONFIG_MTD_SHARPSL_PARTS is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_SST25L is not set
@@ -4065,6 +4066,7 @@ CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
+# CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PM8XXX=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 6bdcd77ce..09eedc9e9 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2914,6 +2914,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
+# CONFIG_MTD_SHARPSL_PARTS is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_SST25L is not set
@@ -3977,6 +3978,7 @@ CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
+# CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PM8XXX=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 3620509d3..4cf1fe829 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2892,6 +2892,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
+# CONFIG_MTD_SHARPSL_PARTS is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_SST25L is not set
@@ -3954,6 +3955,7 @@ CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
+# CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PM8XXX=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 3828a6ec5..6d7dbf9c4 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -3250,6 +3250,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
+# CONFIG_MTD_SHARPSL_PARTS is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_SST25L is not set
@@ -4379,6 +4380,7 @@ CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
+# CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PM8XXX=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 4988c690c..a4384fa3b 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -3230,6 +3230,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
+# CONFIG_MTD_SHARPSL_PARTS is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SPI_NOR is not set
 # CONFIG_MTD_SST25L is not set
@@ -4358,6 +4359,7 @@ CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_PCF50633=m
 CONFIG_RTC_DRV_PCF85063=m
 CONFIG_RTC_DRV_PCF8523=m
+# CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PM8XXX=m
diff --git a/kernel.spec b/kernel.spec
index d7fb6c86b..9aec1ebd4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ 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 2
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -67,9 +67,9 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%global rcrev 0
+%global rcrev 1
 # The git snapshot level
-%define gitrev 7
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -628,9 +628,6 @@ Patch619: input-rmi4-remove-the-need-for-artifical-IRQ.patch
 # rhbz 1509461
 Patch625: v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch
 
-# rhbz 1490803
-Patch626: 1-2-kvm-vmx-Reinstate-support-for-CPUs-without-virtual-NMI.patch
-
 # Pointed to by Eric Anholt
 Patch627: rpi-graphics-fix.patch
 
@@ -2197,6 +2194,9 @@ fi
 #
 #
 %changelog
+* Mon Nov 27 2017 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc1.git0.1
+- Linux v4.15-rc1
+
 * Mon Nov 27 2017 Laura Abbott <labbott@redhat.com>
 - Disable debugging options.
 
diff --git a/sources b/sources
index fa6046fcd..72ea1203d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.14.tar.xz) = 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 SHA512 (perf-man-4.14.tar.gz) = 76a9d8adc284cdffd4b3fbb060e7f9a14109267707ce1d03f4c3239cd70d8d164f697da3a0f90a363fbcac42a61d3c378afbcc2a86f112c501b9cb5ce74ef9f8
-SHA512 (patch-4.14-git7.xz) = 69050e1688dfc7727f668c82e24e63c1afcbb9f30c1cb66f64411953efe0bf5508979174a1251d12fc8412cc2fc279d37fe27845fd3c24a4ebc39292ad805cd0
+SHA512 (patch-4.15-rc1.xz) = 00cb666d762e46b2a965ce27a06272240e9dc375dc92644ade1a512f27ccea615ae609e3b685a0061614859acbdf28fd3d6bfb137e2208f2acc04114ff9fff46