Merge tag 'kvm-3.8-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM updates from Marcelo Tosatti:
 "Considerable KVM/PPC work, x86 kvmclock vsyscall support,
  IA32_TSC_ADJUST MSR emulation, amongst others."

Fix up trivial conflict in kernel/sched/core.c due to cross-cpu
migration notifier added next to rq migration call-back.

* tag 'kvm-3.8-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (156 commits)
  KVM: emulator: fix real mode segment checks in address linearization
  VMX: remove unneeded enable_unrestricted_guest check
  KVM: VMX: fix DPL during entry to protected mode
  x86/kexec: crash_vmclear_local_vmcss needs __rcu
  kvm: Fix irqfd resampler list walk
  KVM: VMX: provide the vmclear function and a bitmap to support VMCLEAR in kdump
  x86/kexec: VMCLEAR VMCSs loaded on all cpus if necessary
  KVM: MMU: optimize for set_spte
  KVM: PPC: booke: Get/set guest EPCR register using ONE_REG interface
  KVM: PPC: bookehv: Add EPCR support in mtspr/mfspr emulation
  KVM: PPC: bookehv: Add guest computation mode for irq delivery
  KVM: PPC: Make EPCR a valid field for booke64 and bookehv
  KVM: PPC: booke: Extend MAS2 EPN mask for 64-bit
  KVM: PPC: e500: Mask MAS2 EPN high 32-bits in 32/64 tlbwe emulation
  KVM: PPC: Mask ea's high 32-bits in 32/64 instr emulation
  KVM: PPC: e500: Add emulation helper for getting instruction ea
  KVM: PPC: bookehv64: Add support for interrupt handling
  KVM: PPC: bookehv: Remove GET_VCPU macro from exception handler
  KVM: PPC: booke: Fix get_tb() compile error on 64-bit
  KVM: PPC: e500: Silence bogus GCC warning in tlb code
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/ia64/kvm/kvm-ia64.c
Simple merge

diff --cc arch/powerpc/include/asm/Kbuild
index 2d62b484b3fcd0599ca9ed1fcddcdf7c70b26a61,324495a08c87f9c8b2c3bbe2923f6c6e0fa71e8f..650757c300dbe71ca5e29d127a0c2c923d37ee4f
--- 1/arch/powerpc/include/asm/Kbuild
--- 2/arch/powerpc/include/asm/Kbuild
+++ b/arch/powerpc/include/asm/Kbuild
@@@ -1,5 -1,3 +1,4 @@@
  
- 
  generic-y += clkdev.h
  generic-y += rwsem.h
 +generic-y += trace_clock.h

diff --cc arch/s390/kvm/kvm-s390.c
Simple merge

diff --cc arch/x86/include/asm/cpufeature.h
Simple merge

diff --cc arch/x86/include/asm/msr-index.h
Simple merge

diff --cc arch/x86/kvm/cpuid.h
Simple merge

diff --cc arch/x86/kvm/emulate.c
Simple merge

diff --cc arch/x86/kvm/vmx.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc include/linux/kvm_host.h
Simple merge

diff --cc include/linux/sched.h
index 651b51a36711103162ff9a9dc13eaca1c93bddc3,6eb2ed819e366df6e84c59a4fd591b560e1a4463..2c2f3072beef061faf0a2eb721ee2f05aad58d4a
--- 1/include/linux/sched.h
--- 2/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -107,10 -107,16 +107,18 @@@ extern unsigned long this_cpu_load(void
  extern void calc_global_load(unsigned long ticks);
  extern void update_cpu_load_nohz(void);
  
+ /* Notifier for when a task gets migrated to a new CPU */
+ struct task_migration_notifier {
+       struct task_struct *task;
+       int from_cpu;
+       int to_cpu;
+ };
+ extern void register_task_migration_notifier(struct notifier_block *n);
+ 
  extern unsigned long get_parent_ip(unsigned long addr);
  
 +extern void dump_cpu_task(int cpu);
 +
  struct seq_file;
  struct cfs_rq;
  struct task_group;

diff --cc kernel/sched/core.c
index 6271b89f87acb4eb6ad834732256a62317d14566,c86b8b6e70f4369ee39831cdd7298ec3ceeb3ba2..0533496b6228cfde3afe20051006683da12e0ca5
--- 1/kernel/sched/core.c
--- 2/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@@ -953,10 -959,16 +960,18 @@@ void set_task_cpu(struct task_struct *p
        trace_sched_migrate_task(p, new_cpu);
  
        if (task_cpu(p) != new_cpu) {
+               struct task_migration_notifier tmn;
+ 
 +              if (p->sched_class->migrate_task_rq)
 +                      p->sched_class->migrate_task_rq(p, new_cpu);
                p->se.nr_migrations++;
                perf_sw_event(PERF_COUNT_SW_CPU_MIGRATIONS, 1, NULL, 0);
+ 
+               tmn.task = p;
+               tmn.from_cpu = task_cpu(p);
+               tmn.to_cpu = new_cpu;
+ 
+               atomic_notifier_call_chain(&task_migration_notifier, 0, &tmn);
        }
  
        __set_task_cpu(p, new_cpu);

diff --cc kernel/time/timekeeping.c
Simple merge