Merge tag 'for-linus-4.15-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull xen updates from Juergen Gross:
 "Xen features and fixes for v4.15-rc1

  Apart from several small fixes it contains the following features:

   - a series by Joao Martins to add vdso support of the pv clock
     interface

   - a series by Juergen Gross to add support for Xen pv guests to be
     able to run on 5 level paging hosts

   - a series by Stefano Stabellini adding the Xen pvcalls frontend
     driver using a paravirtualized socket interface"

* tag 'for-linus-4.15-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: (34 commits)
  xen/pvcalls: fix potential endless loop in pvcalls-front.c
  xen/pvcalls: Add MODULE_LICENSE()
  MAINTAINERS: xen, kvm: track pvclock-abi.h changes
  x86/xen/time: setup vcpu 0 time info page
  x86/xen/time: set pvclock flags on xen_time_init()
  x86/pvclock: add setter for pvclock_pvti_cpu0_va
  ptp_kvm: probe for kvm guest availability
  xen/privcmd: remove unused variable pageidx
  xen: select grant interface version
  xen: update arch/x86/include/asm/xen/cpuid.h
  xen: add grant interface version dependent constants to gnttab_ops
  xen: limit grant v2 interface to the v1 functionality
  xen: re-introduce support for grant v2 interface
  xen: support priv-mapping in an HVM tools domain
  xen/pvcalls: remove redundant check for irq >= 0
  xen/pvcalls: fix unsigned less than zero error check
  xen/time: Return -ENODEV from xen_get_wallclock()
  xen/pvcalls-front: mark expected switch fall-through
  xen: xenbus_probe_frontend: mark expected switch fall-throughs
  xen/time: do not decrease steal time after live migration on xen
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/entry/vdso/vma.c
index d63053142b1685c9c150843cf9b2860617d1cfd8,a77fd3c8d8241c15e34da8af3eea4d48e47c75a8..5b8b556dbb12aa91664aac85fad9e0d5af0259cd
--- 1/arch/x86/entry/vdso/vma.c
--- 2/arch/x86/entry/vdso/vma.c
+++ b/arch/x86/entry/vdso/vma.c
@@@ -112,13 -112,12 +112,13 @@@ static int vvar_fault(const struct vm_s
                                    __pa_symbol(&__vvar_page) >> PAGE_SHIFT);
        } else if (sym_offset == image->sym_pvclock_page) {
                struct pvclock_vsyscall_time_info *pvti =
-                       pvclock_pvti_cpu0_va();
+                       pvclock_get_pvti_cpu0_va();
                if (pvti && vclock_was_used(VCLOCK_PVCLOCK)) {
 -                      ret = vm_insert_pfn(
 +                      ret = vm_insert_pfn_prot(
                                vma,
                                vmf->address,
 -                              __pa(pvti) >> PAGE_SHIFT);
 +                              __pa(pvti) >> PAGE_SHIFT,
 +                              pgprot_decrypted(vma->vm_page_prot));
                }
        } else if (sym_offset == image->sym_hvclock_page) {
                struct ms_hyperv_tsc_page *tsc_pg = hv_get_tsc_page();

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

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

diff --cc arch/x86/kernel/kvmclock.c
index 77b492c2d6584ffb0f86ab1e600e8b9c1d2eae10,538738047ff5cb6d5a59bb927cd9fd254cce40f0..8b26c9e01cc4e26005f383fdeb7cf21442cb1814
--- 1/arch/x86/kernel/kvmclock.c
--- 2/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@@ -46,14 -45,8 +46,8 @@@ early_param("no-kvmclock", parse_no_kvm
  
  /* The hypervisor will put information about time periodically here */
  static struct pvclock_vsyscall_time_info *hv_clock;
 -static struct pvclock_wall_clock wall_clock;
 +static struct pvclock_wall_clock *wall_clock;
  
- struct pvclock_vsyscall_time_info *pvclock_pvti_cpu0_va(void)
- {
-       return hv_clock;
- }
- EXPORT_SYMBOL_GPL(pvclock_pvti_cpu0_va);
- 
  /*
   * The wallclock is the time of day when we booted. Since then, some time may
   * have elapsed since the hypervisor wrote the data. So we try to account for

diff --cc arch/x86/xen/mmu_pv.c
Simple merge

diff --cc arch/x86/xen/suspend.c
Simple merge

diff --cc arch/x86/xen/time.c
Simple merge

diff --cc arch/x86/xen/xen-ops.h
Simple merge

diff --cc drivers/xen/Makefile
Simple merge

diff --cc drivers/xen/grant-table.c
Simple merge

diff --cc drivers/xen/time.c
Simple merge

diff --cc include/xen/xen-ops.h
Simple merge