The patch titled
Subject: linux-next-git-rejects
has been removed from the -mm tree. Its filename was
linux-next-git-rejects.patch
This patch was dropped because it is obsolete
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
diff -puN arch/x86/kvm/vmx.c~linux-next-git-rejects arch/x86/kvm/vmx.c
--- a/arch/x86/kvm/vmx.c~linux-next-git-rejects
+++ a/arch/x86/kvm/vmx.c
@@ -2357,13 +2357,7 @@ static unsigned long segment_base(u16 se
static void vmx_save_host_state(struct kvm_vcpu *vcpu)
{
struct vcpu_vmx *vmx = to_vmx(vcpu);
-<<<<<<< HEAD
-#ifdef CONFIG_X86_64
- int cpu = raw_smp_processor_id();
-#endif
-=======
int cpu = raw_smp_processor_id();
->>>>>>> linux-next/akpm-base
int i;
if (vmx->host_state.loaded)
@@ -2403,11 +2397,6 @@ static void vmx_save_host_state(struct k
savesegment(ds, vmx->host_state.ds_sel);
savesegment(es, vmx->host_state.es_sel);
-<<<<<<< HEAD
- vmcs_writel(HOST_FS_BASE, current->thread.fsbase);
- vmcs_writel(HOST_GS_BASE, cpu_kernelmode_gs_base(cpu));
-
-=======
#ifdef CONFIG_X86_64
vmcs_writel(HOST_FS_BASE, current->thread.fsbase);
vmcs_writel(HOST_GS_BASE, cpu_kernelmode_gs_base(cpu));
@@ -2417,7 +2406,6 @@ static void vmx_save_host_state(struct k
#endif
#ifdef CONFIG_X86_64
->>>>>>> linux-next/akpm-base
vmx->msr_host_kernel_gs_base = current->thread.gsbase;
if (is_long_mode(&vmx->vcpu))
wrmsrl(MSR_KERNEL_GS_BASE, vmx->msr_guest_kernel_gs_base);
@@ -7188,15 +7176,6 @@ static int handle_invalid_guest_state(st
out:
return ret;
-<<<<<<< HEAD
-
-emulation_error:
- vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR;
- vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_EMULATION;
- vcpu->run->internal.ndata = 0;
- return 0;
-=======
->>>>>>> linux-next/akpm-base
}
static void grow_ple_window(struct kvm_vcpu *vcpu)
diff -puN arch/x86/kvm/x86.c~linux-next-git-rejects arch/x86/kvm/x86.c
--- a/arch/x86/kvm/x86.c~linux-next-git-rejects
+++ a/arch/x86/kvm/x86.c
@@ -146,12 +146,6 @@ bool __read_mostly enable_vmware_backdoo
module_param(enable_vmware_backdoor, bool, S_IRUGO);
EXPORT_SYMBOL_GPL(enable_vmware_backdoor);
-<<<<<<< HEAD
-static bool __read_mostly force_emulation_prefix = false;
-module_param(force_emulation_prefix, bool, S_IRUGO);
-
-=======
->>>>>>> linux-next/akpm-base
#define KVM_NR_SHARED_MSRS 16
struct kvm_shared_msrs_global {
diff -puN drivers/video/console/Kconfig~linux-next-git-rejects drivers/video/console/Kconfig
--- a/drivers/video/console/Kconfig~linux-next-git-rejects
+++ a/drivers/video/console/Kconfig
@@ -8,11 +8,7 @@ config VGA_CONSOLE
bool "VGA text console" if EXPERT || !X86
depends on !4xx && !PPC_8xx && !SPARC && !M68K && !PARISC && !SUPERH && \
(!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \
-<<<<<<< HEAD
- !ARM64 && !ARC && !MICROBLAZE && !OPENRISC && !NDS32 && !S390
-=======
!ARM64 && !ARC && !MICROBLAZE && !OPENRISC && !NDS32 && HAS_IOMEM && !S390
->>>>>>> linux-next/akpm-base
default y
help
Saying Y here will allow you to use Linux in text mode through a
diff -puN drivers/video/Kconfig~linux-next-git-rejects drivers/video/Kconfig
--- a/drivers/video/Kconfig~linux-next-git-rejects
+++ a/drivers/video/Kconfig
@@ -3,11 +3,6 @@
#
menu "Graphics support"
-<<<<<<< HEAD
-
-if HAS_IOMEM
-=======
->>>>>>> linux-next/akpm-base
if HAS_IOMEM
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
mm-gup_benchmark-handle-gup-failures-fix.patch
mm-pagemap-fix-swap-offset-value-for-pmd-migration-entry-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch
mm.patch
z3fold-fix-memory-leak-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
proc-add-seq_put_decimal_ull_width-to-speed-up-proc-pid-smaps-fix.patch
fs-reiserfs-journalc-add-missing-resierfs_warning-arg.patch
ipc-shmc-shm_split-remove-unneeded-test-for-null-shm_file_datavm_ops.patch
linux-next-rejects.patch
linux-next-fixup.patch
fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
